added wxZipFSHandler::Cleanup() (modified patch 1213615)

[wxWidgets.git] / src / os2 / toplevel.cpp

diff --git a/src/os2/toplevel.cpp b/src/os2/toplevel.cpp
index 1687a5b7ab20d14b93ecd8880ae5b71b66019fd2..273cbab7f78164c86f190438a97d363e55e393ae 100644 (file)
--- a/src/os2/toplevel.cpp
+++ b/src/os2/toplevel.cpp
@@ -307,12 +307,11 @@ WXHWND wxTopLevelWindowOS2::OS2GetParent() const
     return (WXHWND)hWndParent;
 } // end of wxTopLevelWindowOS2::OS2GetParent
 
     return (WXHWND)hWndParent;
 } // end of wxTopLevelWindowOS2::OS2GetParent
 

-bool wxTopLevelWindowOS2::CreateDialog(
-  ULONG                             ulDlgTemplate
-, const wxString&                   rsTitle
-, const wxPoint&                    rPos
-, const wxSize&                     rSize
-)
+
+bool wxTopLevelWindowOS2::CreateDialog( ULONG           ulDlgTemplate,
+                                        const wxString& WXUNUSED(rsTitle),
+                                        const wxPoint&  rPos,
+                                        const wxSize&   rSize )

 {
     wxWindow*                       pParent = GetParent();
 
 {
     wxWindow*                       pParent = GetParent();
 


@@ -413,7 +412,7 @@ bool wxTopLevelWindowOS2::CreateDialog(
         nX = (vSizeDpy.x - nWidth) / 2;
         nY = (vSizeDpy.y - nHeight) / 2;
     }
         nX = (vSizeDpy.x - nWidth) / 2;
         nY = (vSizeDpy.y - nHeight) / 2;
     }

-    m_backgroundColour.Set(wxString("LIGHT GREY"));
+    m_backgroundColour.Set(wxString(wxT("LIGHT GREY")));

 
     LONG                            lColor = (LONG)m_backgroundColour.GetPixel();
 
 
     LONG                            lColor = (LONG)m_backgroundColour.GetPixel();
 


@@ -498,7 +497,7 @@ bool wxTopLevelWindowOS2::CreateFrame(
     {
         vError = ::WinGetLastError(vHabmain);
         sError = wxPMErrorToStr(vError);
     {
         vError = ::WinGetLastError(vHabmain);
         sError = wxPMErrorToStr(vError);

-        wxLogError("Error creating frame. Error: %s\n", sError.c_str());
+        wxLogError(_T("Error creating frame. Error: %s\n"), sError.c_str());

         return FALSE;
     }
 
         return FALSE;
     }
 


@@ -510,7 +509,7 @@ bool wxTopLevelWindowOS2::CreateFrame(
     wxAssociateWinWithHandle(m_hWnd, this);
     wxAssociateWinWithHandle(m_hFrame, this);
 
     wxAssociateWinWithHandle(m_hWnd, this);
     wxAssociateWinWithHandle(m_hFrame, this);
 

-    m_backgroundColour.Set(wxString("MEDIUM GREY"));
+    m_backgroundColour.Set(wxString(wxT("MEDIUM GREY")));

 
     LONG                            lColor = (LONG)m_backgroundColour.GetPixel();
 
 
     LONG                            lColor = (LONG)m_backgroundColour.GetPixel();
 


@@ -522,7 +521,7 @@ bool wxTopLevelWindowOS2::CreateFrame(
     {
         vError = ::WinGetLastError(vHabmain);
         sError = wxPMErrorToStr(vError);
     {
         vError = ::WinGetLastError(vHabmain);
         sError = wxPMErrorToStr(vError);

-        wxLogError("Error creating frame. Error: %s\n", sError.c_str());
+        wxLogError(_T("Error creating frame. Error: %s\n"), sError.c_str());

         return FALSE;
     }
 
         return FALSE;
     }
 


@@ -559,7 +558,7 @@ bool wxTopLevelWindowOS2::CreateFrame(
     {
         vError = ::WinGetLastError(vHabmain);
         sError = wxPMErrorToStr(vError);
     {
         vError = ::WinGetLastError(vHabmain);
         sError = wxPMErrorToStr(vError);

-        wxLogError("Error sizing frame. Error: %s\n", sError.c_str());
+        wxLogError(_T("Error sizing frame. Error: %s\n"), sError.c_str());

         return FALSE;
     }
     lStyle =  ::WinQueryWindowULong( m_hWnd
         return FALSE;
     }
     lStyle =  ::WinQueryWindowULong( m_hWnd


@@ -756,7 +755,7 @@ bool wxTopLevelWindowOS2::Show(
         wxActivateEvent             vEvent(wxEVT_ACTIVATE, TRUE, m_windowId);
 
         ::WinQueryWindowPos(m_hFrame, &vSwp);
         wxActivateEvent             vEvent(wxEVT_ACTIVATE, TRUE, m_windowId);
 
         ::WinQueryWindowPos(m_hFrame, &vSwp);

-        m_bIconized = vSwp.fl & SWP_MINIMIZE;
+        m_bIconized = ( vSwp.fl & SWP_MINIMIZE ) == SWP_MINIMIZE ;

         ::WinQueryWindowPos(m_hWnd, &m_vSwpClient);
         ::WinSendMsg(m_hFrame, WM_UPDATEFRAME, (MPARAM)~0, 0);
         ::WinQueryWindowPos(m_hWnd, &vSwp);
         ::WinQueryWindowPos(m_hWnd, &m_vSwpClient);
         ::WinSendMsg(m_hFrame, WM_UPDATEFRAME, (MPARAM)~0, 0);
         ::WinQueryWindowPos(m_hWnd, &vSwp);


@@ -779,7 +778,7 @@ bool wxTopLevelWindowOS2::Show(
             HWND                    hWndParent = GetHwndOf(GetParent());
 
             ::WinQueryWindowPos(hWndParent, &vSwp);
             HWND                    hWndParent = GetHwndOf(GetParent());
 
             ::WinQueryWindowPos(hWndParent, &vSwp);

-            m_bIconized = vSwp.fl & SWP_MINIMIZE;
+            m_bIconized = (vSwp.fl & SWP_MINIMIZE)==SWP_MINIMIZE;

             ::WinEnableWindow(hWndParent, TRUE);
         }
     }
             ::WinEnableWindow(hWndParent, TRUE);
         }
     }


@@ -813,9 +812,8 @@ void wxTopLevelWindowOS2::Maximize(
 
 bool wxTopLevelWindowOS2::IsMaximized() const
 {
 
 bool wxTopLevelWindowOS2::IsMaximized() const
 {

-

     ::WinQueryWindowPos(m_hFrame, (PSWP)&m_vSwp);
     ::WinQueryWindowPos(m_hFrame, (PSWP)&m_vSwp);

-    return (m_vSwp.fl & SWP_MAXIMIZE);
+    return (m_vSwp.fl & SWP_MAXIMIZE) == SWP_MAXIMIZE;

 } // end of wxTopLevelWindowOS2::IsMaximized
 
 void wxTopLevelWindowOS2::Iconize(
 } // end of wxTopLevelWindowOS2::IsMaximized
 
 void wxTopLevelWindowOS2::Iconize(


@@ -860,17 +858,15 @@ void wxTopLevelWindowOS2::SendSizeEvent()
 // wxTopLevelWindowOS2 fullscreen
 // ----------------------------------------------------------------------------
 
 // wxTopLevelWindowOS2 fullscreen
 // ----------------------------------------------------------------------------
 

-bool wxTopLevelWindowOS2::ShowFullScreen(
-  bool                              bShow
-, long                              lStyle
-)
+bool wxTopLevelWindowOS2::ShowFullScreen( bool bShow,
+                                          long lStyle )

 {
     if (bShow)
     {
         if (IsFullScreen())
 {
     if (bShow)
     {
         if (IsFullScreen())

-            return FALSE;
+            return false;

 
 

-        m_bFsIsShowing = TRUE;
+        m_bFsIsShowing = true;

         m_lFsStyle = lStyle;
 
         //
         m_lFsStyle = lStyle;
 
         //


@@ -893,8 +889,8 @@ bool wxTopLevelWindowOS2::ShowFullScreen(
         //
         // Decide which window lStyle flags to turn off
         //
         //
         // Decide which window lStyle flags to turn off
         //

-        LONG                        lNewStyle = m_lFsOldWindowStyle;
-        LONG                        lOffFlags = 0;
+        LONG lNewStyle = m_lFsOldWindowStyle;
+        LONG lOffFlags = 0;

 
         if (lStyle & wxFULLSCREEN_NOBORDER)
             lOffFlags |= FCF_BORDER;
 
         if (lStyle & wxFULLSCREEN_NOBORDER)
             lOffFlags |= FCF_BORDER;


@@ -914,16 +910,14 @@ bool wxTopLevelWindowOS2::ShowFullScreen(
         //
         // Resize to the size of the desktop
         //
         //
         // Resize to the size of the desktop
         //

-        int                         nWidth;
-        int                         nHeight;
-        RECTL                       vRect = wxGetWindowRect(HWND_DESKTOP);
+        int   nWidth;
+        int   nHeight;
+        RECTL vRect = wxGetWindowRect(HWND_DESKTOP);

 
         nWidth = vRect.xRight - vRect.xLeft;
         nHeight = vRect.yTop - vRect.yBottom;
 
 
         nWidth = vRect.xRight - vRect.xLeft;
         nHeight = vRect.yTop - vRect.yBottom;
 

-        SetSize( nWidth
-                ,nHeight
-               );
+        SetSize( nWidth, nHeight );

 
         //
         // Now flush the window style cache and actually go full-screen
 
         //
         // Now flush the window style cache and actually go full-screen


@@ -937,21 +931,17 @@ bool wxTopLevelWindowOS2::ShowFullScreen(
                           ,SWP_SIZE | SWP_MOVE
                          );
 
                           ,SWP_SIZE | SWP_MOVE
                          );
 

-        wxSizeEvent                 vEvent( wxSize( nWidth
-                                                   ,nHeight
-                                                  )
-                                           ,GetId()
-                                          );
-
+        wxSize full( nWidth, nHeight );
+        wxSizeEvent vEvent( full, GetId() );

         GetEventHandler()->ProcessEvent(vEvent);
         GetEventHandler()->ProcessEvent(vEvent);

-        return TRUE;
+        return true;

     }
     else
     {
         if (!IsFullScreen())
     }
     else
     {
         if (!IsFullScreen())

-            return FALSE;
+            return false;

 
 

-        m_bFsIsShowing = FALSE;
+        m_bFsIsShowing = false;

         Maximize(m_bFsIsMaximized);
         ::WinSetWindowULong( (HWND)GetHWND()
                             ,QWL_STYLE
         Maximize(m_bFsIsMaximized);
         ::WinSetWindowULong( (HWND)GetHWND()
                             ,QWL_STYLE


@@ -965,7 +955,7 @@ bool wxTopLevelWindowOS2::ShowFullScreen(
                           ,m_vFsOldSize.height
                           ,SWP_SIZE | SWP_MOVE
                          );
                           ,m_vFsOldSize.height
                           ,SWP_SIZE | SWP_MOVE
                          );

-        return TRUE;
+        return true;

     }
 } // end of wxTopLevelWindowOS2::ShowFullScreen
 
     }
 } // end of wxTopLevelWindowOS2::ShowFullScreen
 


@@ -1087,7 +1077,7 @@ HWND wxTLWHiddenParentModule::GetHWND()
             static const wxChar*    zHIDDEN_PARENT_CLASS = _T("wxTLWHiddenParent");
 
             if (!::WinRegisterClass( wxGetInstance()
             static const wxChar*    zHIDDEN_PARENT_CLASS = _T("wxTLWHiddenParent");
 
             if (!::WinRegisterClass( wxGetInstance()

-                                    ,zHIDDEN_PARENT_CLASS
+                                    ,(PSZ)zHIDDEN_PARENT_CLASS

                                     ,NULL
                                     ,0
                                     ,sizeof(ULONG)
                                     ,NULL
                                     ,0
                                     ,sizeof(ULONG)


@@ -1101,7 +1091,7 @@ HWND wxTLWHiddenParentModule::GetHWND()
             }
         }
         m_shWnd = ::WinCreateWindow( HWND_DESKTOP
             }
         }
         m_shWnd = ::WinCreateWindow( HWND_DESKTOP

-                                    ,m_szClassName
+                                    ,(PSZ)m_szClassName

                                     ,""
                                     ,0L
                                     ,(LONG)0L
                                     ,""
                                     ,0L
                                     ,(LONG)0L