fix focus problems in picker controls under MSW which were due to not letting the...

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

diff --git a/src/os2/toplevel.cpp b/src/os2/toplevel.cpp
index acd6125243f5523c814fb57f46f5bfbafc16f9cf..fde6f06b6f97f0ed5cb42bc6d67c635d8a41648c 100644 (file)
--- a/src/os2/toplevel.cpp
+++ b/src/os2/toplevel.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        os2/toplevel.cpp
+// Name:        src/os2/toplevel.cpp

 // Purpose:     implements wxTopLevelWindow for OS/2
 // Author:      Vadim Zeitlin
 // Modified by:
 // Purpose:     implements wxTopLevelWindow for OS/2
 // Author:      Vadim Zeitlin
 // Modified by:


@@ -24,9 +24,10 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#include "wx/toplevel.h"
+

 #ifndef WX_PRECOMP
     #include "wx/app.h"
 #ifndef WX_PRECOMP
     #include "wx/app.h"

-    #include "wx/toplevel.h"

     #include "wx/dialog.h"
     #include "wx/string.h"
     #include "wx/log.h"
     #include "wx/dialog.h"
     #include "wx/string.h"
     #include "wx/log.h"


@@ -34,9 +35,10 @@
     #include "wx/frame.h"
     #include "wx/control.h"
     #include "wx/containr.h"        // wxSetFocusToChild()
     #include "wx/frame.h"
     #include "wx/control.h"
     #include "wx/containr.h"        // wxSetFocusToChild()

+    #include "wx/settings.h"
+    #include "wx/module.h"        // wxSetFocusToChild()

 #endif //WX_PRECOMP
 
 #endif //WX_PRECOMP
 

-#include "wx/module.h"        // wxSetFocusToChild()

 #include "wx/os2/private.h"
 
 // ----------------------------------------------------------------------------
 #include "wx/os2/private.h"
 
 // ----------------------------------------------------------------------------


@@ -49,11 +51,10 @@
 // ----------------------------------------------------------------------------
 
 // the name of the default wxWidgets class
 // ----------------------------------------------------------------------------
 
 // the name of the default wxWidgets class

-extern void          wxAssociateWinWithHandle( HWND         hWnd
-                                              ,wxWindowOS2* pWin
-                                             );
-bool                 wxTopLevelWindowOS2::m_sbInitialized = FALSE;
-wxWindow*            wxTopLevelWindowOS2::m_spHiddenParent = NULL;
+extern void wxAssociateWinWithHandle( HWND hWnd, wxWindowOS2* pWin );
+
+bool wxTopLevelWindowOS2::m_sbInitialized = false;
+wxWindow* wxTopLevelWindowOS2::m_spHiddenParent = NULL;

 
 // ============================================================================
 // wxTopLevelWindowOS2 implementation
 
 // ============================================================================
 // wxTopLevelWindowOS2 implementation


@@ -115,12 +116,12 @@ private:
     //
     // The HWND of the hidden parent
     //
     //
     // The HWND of the hidden parent
     //

-    static HWND                     m_shWnd;
+    static HWND m_shWnd;

 
     //
     // The class used to create it
     //
 
     //
     // The class used to create it
     //

-    static const wxChar*            m_szClassName;
+    static const wxChar* m_szClassName;

     DECLARE_DYNAMIC_CLASS(wxTLWHiddenParentModule)
 }; // end of CLASS wxTLWHiddenParentModule
 
     DECLARE_DYNAMIC_CLASS(wxTLWHiddenParentModule)
 }; // end of CLASS wxTLWHiddenParentModule
 


@@ -132,19 +133,19 @@ IMPLEMENT_DYNAMIC_CLASS(wxTLWHiddenParentModule, wxModule)
 
 void wxTopLevelWindowOS2::Init()
 {
 
 void wxTopLevelWindowOS2::Init()
 {

-    m_bIconized = m_bMaximizeOnShow = FALSE;
+    m_bIconized = m_bMaximizeOnShow = false;

 
     //
     // Unlike (almost?) all other windows, frames are created hidden
     //
 
     //
     // Unlike (almost?) all other windows, frames are created hidden
     //

-    m_isShown = FALSE;
+    m_isShown = false;

 
     //
     // Data to save/restore when calling ShowFullScreen
     m_lFsStyle          = 0;
     m_lFsOldWindowStyle = 0;
 
     //
     // Data to save/restore when calling ShowFullScreen
     m_lFsStyle          = 0;
     m_lFsOldWindowStyle = 0;

-    m_bFsIsMaximized    = FALSE;
-    m_bFsIsShowing      = FALSE;
+    m_bFsIsMaximized    = false;
+    m_bFsIsShowing      = false;

 
     m_hFrame    = NULLHANDLE;
     memset(&m_vSwp, 0, sizeof(SWP));
 
     m_hFrame    = NULLHANDLE;
     memset(&m_vSwp, 0, sizeof(SWP));


@@ -234,7 +235,7 @@ WXDWORD wxTopLevelWindowOS2::OS2GetStyle(
         lMsflags |= FCF_MINBUTTON;
     if (lStyle & wxMAXIMIZE_BOX)
         lMsflags |= FCF_MAXBUTTON;
         lMsflags |= FCF_MINBUTTON;
     if (lStyle & wxMAXIMIZE_BOX)
         lMsflags |= FCF_MAXBUTTON;

-    if (lStyle & wxTHICK_FRAME)
+    if (lStyle & wxRESIZE_BORDER)

         lMsflags |= FCF_DLGBORDER;
     if (lStyle & wxSYSTEM_MENU)
         lMsflags |= FCF_SYSMENU;
         lMsflags |= FCF_DLGBORDER;
     if (lStyle & wxSYSTEM_MENU)
         lMsflags |= FCF_SYSMENU;


@@ -250,7 +251,7 @@ WXDWORD wxTopLevelWindowOS2::OS2GetStyle(
     if (lStyle & wxTINY_CAPTION_HORIZ)
         lMsflags |= FCF_TASKLIST;
 
     if (lStyle & wxTINY_CAPTION_HORIZ)
         lMsflags |= FCF_TASKLIST;
 

-    if ((lStyle & wxTHICK_FRAME) == 0)
+    if ((lStyle & wxRESIZE_BORDER) == 0)

         lMsflags |= FCF_BORDER;
     if (lStyle & wxFRAME_TOOL_WINDOW)
         *pdwExflags = kFrameToolWindow;
         lMsflags |= FCF_BORDER;
     if (lStyle & wxFRAME_TOOL_WINDOW)
         *pdwExflags = kFrameToolWindow;


@@ -360,7 +361,7 @@ bool wxTopLevelWindowOS2::CreateDialog( ULONG           ulDlgTemplate,
 
         wxLogSysError(wxT("Can't create dialog using template '%ld'"), ulDlgTemplate);
 
 
         wxLogSysError(wxT("Can't create dialog using template '%ld'"), ulDlgTemplate);
 

-        return FALSE;
+        return false;

     }
 
     //
     }
 
     //


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

-    m_backgroundColour.Set(wxString(wxT("LIGHT GREY")));
+    SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE));

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


@@ -418,9 +419,12 @@ bool wxTopLevelWindowOS2::CreateDialog( ULONG           ulDlgTemplate,
                            ,(PVOID)&lColor
                           ))
     {
                            ,(PVOID)&lColor
                           ))
     {

-        return FALSE;
+        return false;

     }
 
     }
 

+    // Convert to OS/2 coordinates
+    nY = GetOS2ParentHeight(pParent) - nY - nHeight;
+

     ::WinSetWindowPos( GetHwnd()
                       ,HWND_TOP
                       ,nX
     ::WinSetWindowPos( GetHwnd()
                       ,HWND_TOP
                       ,nX


@@ -432,29 +436,27 @@ bool wxTopLevelWindowOS2::CreateDialog( ULONG           ulDlgTemplate,
     ::WinQueryWindowPos(GetHwnd(), GetSwp());
     m_hFrame = m_hWnd;
     SubclassWin(m_hWnd);
     ::WinQueryWindowPos(GetHwnd(), GetSwp());
     m_hFrame = m_hWnd;
     SubclassWin(m_hWnd);

-    return TRUE;
+    return true;

 } // end of wxTopLevelWindowOS2::CreateDialog
 
 } // end of wxTopLevelWindowOS2::CreateDialog
 

-bool wxTopLevelWindowOS2::CreateFrame(
-  const wxString&                   rsTitle
-, const wxPoint&                    rPos
-, const wxSize&                     rSize
-)
+bool wxTopLevelWindowOS2::CreateFrame( const wxString& rsTitle,
+                                       const wxPoint& rPos,
+                                       const wxSize& rSize )

 {
 {

-    WXDWORD                         lExflags;
-    WXDWORD                         lFlags = OS2GetCreateWindowFlags(&lExflags);
-    long                            lStyle = GetWindowStyleFlag();
-    int                             nX = rPos.x;
-    int                             nY = rPos.y;
-    int                             nWidth = rSize.x;
-    int                             nHeight = rSize.y;
-    ULONG                           ulStyleFlags = 0L;
-    ERRORID                         vError;
-    wxString                        sError;
-    wxWindow*                       pParent = GetParent();
-    HWND                            hParent;
-    HWND                            hFrame;
-    HWND                            hClient;
+    WXDWORD    lExflags;
+    WXDWORD    lFlags = OS2GetCreateWindowFlags(&lExflags);
+    long       lStyle = GetWindowStyleFlag();
+    int        nX = rPos.x;
+    int        nY = rPos.y;
+    int        nWidth = rSize.x;
+    int        nHeight = rSize.y;
+    ULONG      ulStyleFlags = 0L;
+    ERRORID    vError;
+    wxString   sError;
+    wxWindow*  pParent = GetParent();
+    HWND       hParent;
+    HWND       hFrame;
+    HWND       hClient;

 
     if (pParent)
         hParent = GetHwndOf(pParent);
 
     if (pParent)
         hParent = GetHwndOf(pParent);


@@ -470,7 +472,7 @@ bool wxTopLevelWindowOS2::CreateFrame(
     // Clear the visible flag, we always call show
     //
     ulStyleFlags &= (unsigned long)~WS_VISIBLE;
     // Clear the visible flag, we always call show
     //
     ulStyleFlags &= (unsigned long)~WS_VISIBLE;

-    m_bIconized = FALSE;
+    m_bIconized = false;

 
     //
     // Create the frame window:  We break ranks with other ports now
 
     //
     // Create the frame window:  We break ranks with other ports now


@@ -482,8 +484,8 @@ bool wxTopLevelWindowOS2::CreateFrame(
      hFrame = ::WinCreateStdWindow( hParent
                                    ,ulStyleFlags          // frame-window style
                                    ,(PULONG)&lFlags       // window style
      hFrame = ::WinCreateStdWindow( hParent
                                    ,ulStyleFlags          // frame-window style
                                    ,(PULONG)&lFlags       // window style

-                                   ,(PSZ)wxFrameClassName // class name
-                                   ,(PSZ)rsTitle.c_str()  // window title
+                                   ,wxString(wxFrameClassName).c_str() // class name
+                                   ,rsTitle.c_str()       // window title

                                    ,0L                    // default client style
                                    ,NULLHANDLE            // resource in executable file
                                    ,0                     // resource id
                                    ,0L                    // default client style
                                    ,NULLHANDLE            // resource in executable file
                                    ,0                     // resource id


@@ -494,7 +496,7 @@ bool wxTopLevelWindowOS2::CreateFrame(
         vError = ::WinGetLastError(vHabmain);
         sError = wxPMErrorToStr(vError);
         wxLogError(_T("Error creating frame. Error: %s\n"), sError.c_str());
         vError = ::WinGetLastError(vHabmain);
         sError = wxPMErrorToStr(vError);
         wxLogError(_T("Error creating frame. Error: %s\n"), sError.c_str());

-        return FALSE;
+        return false;

     }
 
     //
     }
 
     //


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

-    m_backgroundColour.Set(wxString(wxT("MEDIUM GREY")));
+    SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE));

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


@@ -518,7 +520,7 @@ bool wxTopLevelWindowOS2::CreateFrame(
         vError = ::WinGetLastError(vHabmain);
         sError = wxPMErrorToStr(vError);
         wxLogError(_T("Error creating frame. Error: %s\n"), sError.c_str());
         vError = ::WinGetLastError(vHabmain);
         sError = wxPMErrorToStr(vError);
         wxLogError(_T("Error creating frame. Error: %s\n"), sError.c_str());

-        return FALSE;
+        return false;

     }
 
     //
     }
 
     //


@@ -532,17 +534,49 @@ bool wxTopLevelWindowOS2::CreateFrame(
     // Now size everything.  If adding a menu the client will need to be resized.
     //
 
     // Now size everything.  If adding a menu the client will need to be resized.
     //
 

-    if (pParent)
+    if (!OS2GetCreateWindowCoords( rPos
+                                  ,rSize
+                                  ,nX
+                                  ,nY
+                                  ,nWidth
+                                  ,nHeight
+                                 ))

     {
     {

-        nY = pParent->GetSize().y - (nY + nHeight);
+        nX = nWidth = (int)CW_USEDEFAULT;

     }
     }

-    else
+
+    //
+    // We can't use CW_USEDEFAULT here as we're not calling CreateWindow()
+    // and passing CW_USEDEFAULT to MoveWindow() results in resizing the
+    // window to (0, 0) size which breaks quite a lot of things, e.g. the
+    // sizer calculation in wxSizer::Fit()
+    //
+    if (nWidth == (int)CW_USEDEFAULT)

     {
     {

-        RECTL                   vRect;
+        //
+        // The exact number doesn't matter, the dialog will be resized
+        // again soon anyhow but it should be big enough to allow
+        // calculation relying on "totalSize - clientSize > 0" work, i.e.
+        // at least greater than the title bar height
+        //
+        nWidth = nHeight = 100;
+    }
+    if (nX == (int)CW_USEDEFAULT)
+    {
+        //
+        // Centre it on the screen for now - what else can we do?
+        // TODO: We could try FCF_SHELLPOSITION but it will require moving
+        //       things around a bit.
+        //
+        wxSize                      vSizeDpy = wxGetDisplaySize();

 
 

-        ::WinQueryWindowRect(HWND_DESKTOP, &vRect);
-        nY = vRect.yTop - (nY + nHeight);
+        nX = (vSizeDpy.x - nWidth) / 2;
+        nY = (vSizeDpy.y - nHeight) / 2;

     }
     }

+
+    // Convert to OS/2 coordinates
+    nY = GetOS2ParentHeight(pParent) - nY - nHeight;
+

     if (!::WinSetWindowPos( m_hFrame
                            ,HWND_TOP
                            ,nX
     if (!::WinSetWindowPos( m_hFrame
                            ,HWND_TOP
                            ,nX


@@ -555,7 +589,7 @@ bool wxTopLevelWindowOS2::CreateFrame(
         vError = ::WinGetLastError(vHabmain);
         sError = wxPMErrorToStr(vError);
         wxLogError(_T("Error sizing frame. Error: %s\n"), sError.c_str());
         vError = ::WinGetLastError(vHabmain);
         sError = wxPMErrorToStr(vError);
         wxLogError(_T("Error sizing frame. Error: %s\n"), sError.c_str());

-        return FALSE;
+        return false;

     }
     lStyle =  ::WinQueryWindowULong( m_hWnd
                                     ,QWL_STYLE
     }
     lStyle =  ::WinQueryWindowULong( m_hWnd
                                     ,QWL_STYLE


@@ -565,7 +599,7 @@ bool wxTopLevelWindowOS2::CreateFrame(
                         ,QWL_STYLE
                         ,lStyle
                        );
                         ,QWL_STYLE
                         ,lStyle
                        );

-    return TRUE;
+    return true;

 } // end of wxTopLevelWindowOS2::CreateFrame
 
 bool wxTopLevelWindowOS2::Create(
 } // end of wxTopLevelWindowOS2::CreateFrame
 
 bool wxTopLevelWindowOS2::Create(


@@ -605,7 +639,7 @@ bool wxTopLevelWindowOS2::Create(
     if (GetExtraStyle() & wxTOPLEVEL_EX_DIALOG)
     {
         //
     if (GetExtraStyle() & wxTOPLEVEL_EX_DIALOG)
     {
         //

-        // We have different dialog templates to allows creation of dialogs
+        // We have different dialog templates to allow creation of dialogs

         // with & without captions under OS2indows, resizeable or not (but a
         // resizeable dialog always has caption - otherwise it would look too
         // strange)
         // with & without captions under OS2indows, resizeable or not (but a
         // resizeable dialog always has caption - otherwise it would look too
         // strange)


@@ -713,12 +747,10 @@ void wxTopLevelWindowOS2::DoShowWindow(
     m_bIconized = nShowCmd == SWP_MINIMIZE;
 } // end of wxTopLevelWindowOS2::DoShowWindow
 
     m_bIconized = nShowCmd == SWP_MINIMIZE;
 } // end of wxTopLevelWindowOS2::DoShowWindow
 

-bool wxTopLevelWindowOS2::Show(
-  bool                              bShow
-)
+bool wxTopLevelWindowOS2::Show( bool bShow )

 {
 {

-    int                             nShowCmd;
-    SWP                             vSwp;
+    int nShowCmd;
+    SWP vSwp;

 
     if (bShow != IsShown() )
     {
 
     if (bShow != IsShown() )
     {


@@ -726,14 +758,14 @@ bool wxTopLevelWindowOS2::Show(
     }
     else
     {
     }
     else
     {

-        return FALSE;
+        return false;

     }
     if (bShow)
     {
         if (m_bMaximizeOnShow)
         {
             nShowCmd = SWP_MAXIMIZE;
     }
     if (bShow)
     {
         if (m_bMaximizeOnShow)
         {
             nShowCmd = SWP_MAXIMIZE;

-            m_bMaximizeOnShow = FALSE;
+            m_bMaximizeOnShow = false;

         }
         else
         {
         }
         else
         {


@@ -748,7 +780,7 @@ bool wxTopLevelWindowOS2::Show(
 
     if (bShow)
     {
 
     if (bShow)
     {

-        wxActivateEvent             vEvent(wxEVT_ACTIVATE, TRUE, m_windowId);
+        wxActivateEvent vEvent(wxEVT_ACTIVATE, true, m_windowId);

 
         ::WinQueryWindowPos(m_hFrame, &vSwp);
         m_bIconized = ( vSwp.fl & SWP_MINIMIZE ) == SWP_MINIMIZE ;
 
         ::WinQueryWindowPos(m_hFrame, &vSwp);
         m_bIconized = ( vSwp.fl & SWP_MINIMIZE ) == SWP_MINIMIZE ;


@@ -757,12 +789,8 @@ bool wxTopLevelWindowOS2::Show(
         ::WinQueryWindowPos(m_hWnd, &vSwp);
         ::WinEnableWindow(m_hFrame, TRUE);
 
         ::WinQueryWindowPos(m_hWnd, &vSwp);
         ::WinEnableWindow(m_hFrame, TRUE);
 

-        //
-        // Deal with children
-        //
-        MoveChildren(m_vSwpClient.cy - vSwp.cy);

         vEvent.SetEventObject(this);
         vEvent.SetEventObject(this);

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

     }
     else
     {
     }
     else
     {


@@ -771,14 +799,14 @@ bool wxTopLevelWindowOS2::Show(
         //
         if (GetParent())
         {
         //
         if (GetParent())
         {

-            HWND                    hWndParent = GetHwndOf(GetParent());
+            HWND hWndParent = GetHwndOf(GetParent());

 
             ::WinQueryWindowPos(hWndParent, &vSwp);
             m_bIconized = (vSwp.fl & SWP_MINIMIZE)==SWP_MINIMIZE;
             ::WinEnableWindow(hWndParent, TRUE);
         }
     }
 
             ::WinQueryWindowPos(hWndParent, &vSwp);
             m_bIconized = (vSwp.fl & SWP_MINIMIZE)==SWP_MINIMIZE;
             ::WinEnableWindow(hWndParent, TRUE);
         }
     }

-    return TRUE;
+    return true;

 } // end of wxTopLevelWindowOS2::Show
 
 // ----------------------------------------------------------------------------
 } // end of wxTopLevelWindowOS2::Show
 
 // ----------------------------------------------------------------------------


@@ -812,9 +840,17 @@ bool wxTopLevelWindowOS2::IsMaximized() const
     return (m_vSwp.fl & SWP_MAXIMIZE) == SWP_MAXIMIZE;
 } // end of wxTopLevelWindowOS2::IsMaximized
 
     return (m_vSwp.fl & SWP_MAXIMIZE) == SWP_MAXIMIZE;
 } // end of wxTopLevelWindowOS2::IsMaximized
 

-void wxTopLevelWindowOS2::Iconize(
-  bool                              bIconize
-)
+void wxTopLevelWindowOS2::SetTitle( const wxString& title)
+{
+    SetLabel(title);
+}
+
+wxString wxTopLevelWindowOS2::GetTitle() const
+{
+    return GetLabel();
+}
+
+void wxTopLevelWindowOS2::Iconize( bool bIconize )

 {
     DoShowWindow(bIconize ? SWP_MINIMIZE : SWP_RESTORE);
 } // end of wxTopLevelWindowOS2::Iconize
 {
     DoShowWindow(bIconize ? SWP_MINIMIZE : SWP_RESTORE);
 } // end of wxTopLevelWindowOS2::Iconize


@@ -824,9 +860,9 @@ bool wxTopLevelWindowOS2::IsIconized() const
     // also update the current state
     ::WinQueryWindowPos(m_hFrame, (PSWP)&m_vSwp);
     if (m_vSwp.fl & SWP_MINIMIZE)
     // also update the current state
     ::WinQueryWindowPos(m_hFrame, (PSWP)&m_vSwp);
     if (m_vSwp.fl & SWP_MINIMIZE)

-        ((wxTopLevelWindow*)this)->m_bIconized = TRUE;
+        ((wxTopLevelWindow*)this)->m_bIconized = true;

     else
     else

-        ((wxTopLevelWindow*)this)->m_bIconized = FALSE;
+        ((wxTopLevelWindow*)this)->m_bIconized = false;

     return m_bIconized;
 } // end of wxTopLevelWindowOS2::IsIconized
 
     return m_bIconized;
 } // end of wxTopLevelWindowOS2::IsIconized
 


@@ -929,7 +965,7 @@ bool wxTopLevelWindowOS2::ShowFullScreen( bool bShow,
 
         wxSize full( nWidth, nHeight );
         wxSizeEvent vEvent( full, GetId() );
 
         wxSize full( nWidth, nHeight );
         wxSizeEvent vEvent( full, GetId() );

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

         return true;
     }
     else
         return true;
     }
     else


@@ -959,13 +995,6 @@ bool wxTopLevelWindowOS2::ShowFullScreen( bool bShow,
 // wxTopLevelWindowOS2 misc
 // ----------------------------------------------------------------------------
 
 // wxTopLevelWindowOS2 misc
 // ----------------------------------------------------------------------------
 

-void wxTopLevelWindowOS2::SetIcon(
-  const wxIcon&                     rIcon
-)
-{
-    SetIcons(wxIconBundle(rIcon));
-} // end of wxTopLevelWindowOS2::SetIcon
-

 void wxTopLevelWindowOS2::SetIcons(
   const wxIconBundle&               rIcons
 )
 void wxTopLevelWindowOS2::SetIcons(
   const wxIconBundle&               rIcons
 )


@@ -975,9 +1004,9 @@ void wxTopLevelWindowOS2::SetIcons(
     //
     wxTopLevelWindowBase::SetIcons(rIcons);
 
     //
     wxTopLevelWindowBase::SetIcons(rIcons);
 

-    const wxIcon&                   vIcon = rIcons.GetIcon(wxSize(32, 32));
+    const wxIcon& vIcon = rIcons.GetIconOfExactSize(32);

 
 

-    if (vIcon.Ok() && vIcon.GetWidth() == 32 && vIcon.GetHeight() == 32)
+    if (vIcon.Ok())

     {
         ::WinSendMsg( m_hFrame
                      ,WM_SETICON
     {
         ::WinSendMsg( m_hFrame
                      ,WM_SETICON


@@ -992,19 +1021,17 @@ void wxTopLevelWindowOS2::SetIcons(
     }
 } // end of wxTopLevelWindowOS2::SetIcon
 
     }
 } // end of wxTopLevelWindowOS2::SetIcon
 

-bool wxTopLevelWindowOS2::EnableCloseButton(
-  bool                              bEnable
-)
+bool wxTopLevelWindowOS2::EnableCloseButton( bool bEnable )

 {
     //
     // Get system (a.k.a. window) menu
     //
 {
     //
     // Get system (a.k.a. window) menu
     //

-    HMENU                           hMenu = ::WinWindowFromID(m_hFrame, FID_SYSMENU);
+    HMENU hMenu = ::WinWindowFromID(m_hFrame, FID_SYSMENU);

 
     if (!hMenu)
     {
         wxLogLastError(_T("GetSystemMenu"));
 
     if (!hMenu)
     {
         wxLogLastError(_T("GetSystemMenu"));

-        return FALSE;
+        return false;

     }
 
     //
     }
 
     //


@@ -1032,7 +1059,7 @@ bool wxTopLevelWindowOS2::EnableCloseButton(
                  ,(MPARAM)FCF_MENU
                  ,(MPARAM)0
                 );
                  ,(MPARAM)FCF_MENU
                  ,(MPARAM)0
                 );

-    return TRUE;
+    return true;

 } // end of wxTopLevelWindowOS2::EnableCloseButton
 
 // ============================================================================
 } // end of wxTopLevelWindowOS2::EnableCloseButton
 
 // ============================================================================


@@ -1046,7 +1073,7 @@ bool wxTLWHiddenParentModule::OnInit()
 {
     m_shWnd = NULL;
     m_szClassName = NULL;
 {
     m_shWnd = NULL;
     m_szClassName = NULL;

-    return TRUE;
+    return true;

 } // end of wxTLWHiddenParentModule::OnInit
 
 void wxTLWHiddenParentModule::OnExit()
 } // end of wxTLWHiddenParentModule::OnInit
 
 void wxTLWHiddenParentModule::OnExit()


@@ -1086,20 +1113,19 @@ HWND wxTLWHiddenParentModule::GetHWND()
                 m_szClassName = zHIDDEN_PARENT_CLASS;
             }
         }
                 m_szClassName = zHIDDEN_PARENT_CLASS;
             }
         }

-        m_shWnd = ::WinCreateWindow( HWND_DESKTOP
-                                    ,(PSZ)m_szClassName
-                                    ,""
-                                    ,0L
-                                    ,(LONG)0L
-                                    ,(LONG)0L
-                                    ,(LONG)0L
-                                    ,(LONG)0L
-                                    ,NULLHANDLE
-                                    ,HWND_TOP
-                                    ,0L
-                                    ,NULL
-                                    ,NULL
-                                   );
+        m_shWnd = ::WinCreateWindow( HWND_DESKTOP,
+                                     (PSZ)m_szClassName,
+                                     "",
+                                     0L,
+                                     (LONG)0L,
+                                     (LONG)0L,
+                                     (LONG)0L,
+                                     (LONG)0L,
+                                     NULLHANDLE,
+                                     HWND_TOP,
+                                     0L,
+                                     NULL,
+                                     NULL );

         if (!m_shWnd)
         {
             wxLogLastError(_T("CreateWindow(hidden TLW parent)"));
         if (!m_shWnd)
         {
             wxLogLastError(_T("CreateWindow(hidden TLW parent)"));