Add missing WXK constants for the control keys

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

diff --git a/src/os2/toplevel.cpp b/src/os2/toplevel.cpp
index 1d52bad5317513f73fcf9b0d384c3ed95dfcd477..b7df26740e151c5fe5f37fd5823d22c0a1811370 100644 (file)
--- a/src/os2/toplevel.cpp
+++ b/src/os2/toplevel.cpp
@@ -1,12 +1,12 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

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

 // Purpose:     implements wxTopLevelWindow for OS/2
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     30.12.01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2001 SciTech Software, Inc. (www.scitechsoft.com)
 // Purpose:     implements wxTopLevelWindow for OS/2
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     30.12.01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2001 SciTech Software, Inc. (www.scitechsoft.com)

-// License:     wxWidgets licence
+// Licence:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================


@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
-    #pragma implementation "toplevel.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -28,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"


@@ -38,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"
 
 // ----------------------------------------------------------------------------


@@ -52,15 +50,11 @@
 // globals
 // ----------------------------------------------------------------------------
 
 // globals
 // ----------------------------------------------------------------------------
 

-// list of all frames and modeless dialogs
-wxWindowList wxModelessWindows;
-

 // 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


@@ -122,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
 


@@ -139,24 +133,24 @@ 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));
     memset(&m_vSwpClient, 0, sizeof(SWP));
 
     m_hFrame    = NULLHANDLE;
     memset(&m_vSwp, 0, sizeof(SWP));
     memset(&m_vSwpClient, 0, sizeof(SWP));

-    m_pWinLastFocused = (wxWindow *)NULL;
+    m_pWinLastFocused = NULL;

 } // end of wxTopLevelWindowIOS2::Init
 
 void wxTopLevelWindowOS2::OnActivate(
 } // end of wxTopLevelWindowIOS2::Init
 
 void wxTopLevelWindowOS2::OnActivate(


@@ -168,7 +162,7 @@ void wxTopLevelWindowOS2::OnActivate(
         //
         // Restore focus to the child which was last focused
         //
         //
         // Restore focus to the child which was last focused
         //

-        wxLogTrace(_T("focus"), _T("wxTLW %08lx activated."), m_hWnd);
+        wxLogTrace(wxT("focus"), wxT("wxTLW %08lx activated."), m_hWnd);

 
         wxWindow*                   pParent = m_pWinLastFocused ? m_pWinLastFocused->GetParent()
                                                                 : NULL;
 
         wxWindow*                   pParent = m_pWinLastFocused ? m_pWinLastFocused->GetParent()
                                                                 : NULL;


@@ -206,8 +200,8 @@ void wxTopLevelWindowOS2::OnActivate(
             pWin = pWin->GetParent();
         }
 
             pWin = pWin->GetParent();
         }
 

-        wxLogTrace(_T("focus"),
-                   _T("wxTLW %08lx deactivated, last focused: %08lx."),
+        wxLogTrace(wxT("focus"),
+                   wxT("wxTLW %08lx deactivated, last focused: %08lx."),

                    m_hWnd,
                    m_pWinLastFocused ? GetHwndOf(m_pWinLastFocused)
                                      : NULL);
                    m_hWnd,
                    m_pWinLastFocused ? GetHwndOf(m_pWinLastFocused)
                                      : NULL);


@@ -241,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;


@@ -252,12 +246,10 @@ WXDWORD wxTopLevelWindowOS2::OS2GetStyle(
         // Invalid for frame windows under PM
     }
 
         // Invalid for frame windows under PM
     }
 

-    if (lStyle & wxTINY_CAPTION_VERT)
-        lMsflags |= FCF_TASKLIST;
-    if (lStyle & wxTINY_CAPTION_HORIZ)
+    if (lStyle & wxTINY_CAPTION)

         lMsflags |= FCF_TASKLIST;
 
         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;


@@ -287,7 +279,7 @@ WXHWND wxTopLevelWindowOS2::OS2GetParent() const
             //
             // This flag doesn't make sense then and will be ignored
             //
             //
             // This flag doesn't make sense then and will be ignored
             //

-            wxFAIL_MSG( _T("wxFRAME_FLOAT_ON_PARENT but no parent?") );
+            wxFAIL_MSG( wxT("wxFRAME_FLOAT_ON_PARENT but no parent?") );

         }
         else
         {
         }
         else
         {


@@ -310,12 +302,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();
 


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

-        return FALSE;
+        return false;

     }
 
     //
     }
 
     //


@@ -416,7 +407,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"));
+    SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE));

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


@@ -426,9 +417,12 @@ bool wxTopLevelWindowOS2::CreateDialog(
                            ,(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


@@ -440,29 +434,27 @@ bool wxTopLevelWindowOS2::CreateDialog(
     ::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);


@@ -478,7 +470,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


@@ -490,8 +482,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


@@ -501,8 +493,8 @@ 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());
-        return FALSE;
+        wxLogError(wxT("Error creating frame. Error: %s\n"), sError.c_str());
+        return false;

     }
 
     //
     }
 
     //


@@ -513,7 +505,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"));
+    SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE));

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


@@ -525,8 +517,8 @@ 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());
-        return FALSE;
+        wxLogError(wxT("Error creating frame. Error: %s\n"), sError.c_str());
+        return false;

     }
 
     //
     }
 
     //


@@ -540,17 +532,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


@@ -562,8 +586,8 @@ 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());
-        return FALSE;
+        wxLogError(wxT("Error sizing frame. Error: %s\n"), sError.c_str());
+        return false;

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


@@ -573,7 +597,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(


@@ -613,9 +637,9 @@ bool wxTopLevelWindowOS2::Create(
     if (GetExtraStyle() & wxTOPLEVEL_EX_DIALOG)
     {
         //
     if (GetExtraStyle() & wxTOPLEVEL_EX_DIALOG)
     {
         //

-        // We have different dialog templates to allows creation of dialogs
-        // with & without captions under OS2indows, resizeable or not (but a
-        // resizeable dialog always has caption - otherwise it would look too
+        // We have different dialog templates to allow creation of dialogs
+        // with & without captions under OS2indows, resizable or not (but a
+        // resizable dialog always has caption - otherwise it would look too

         // strange)
         //
         ULONG                       ulDlgTemplate;
         // strange)
         //
         ULONG                       ulDlgTemplate;


@@ -643,9 +667,6 @@ bool wxTopLevelWindowOS2::Create(
 
 wxTopLevelWindowOS2::~wxTopLevelWindowOS2()
 {
 
 wxTopLevelWindowOS2::~wxTopLevelWindowOS2()
 {

-    if (wxModelessWindows.Find(this))
-        wxModelessWindows.DeleteObject(this);
-

     //
     // After destroying an owned window, Windows activates the next top level
     // window in Z order but it may be different from our owner (to reproduce
     //
     // After destroying an owned window, Windows activates the next top level
     // window in Z order but it may be different from our owner (to reproduce


@@ -724,12 +745,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() )
     {


@@ -737,14 +756,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
         {


@@ -759,21 +778,17 @@ 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);
 
         ::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);
         ::WinEnableWindow(m_hFrame, TRUE);
 
         ::WinQueryWindowPos(m_hWnd, &m_vSwpClient);
         ::WinSendMsg(m_hFrame, WM_UPDATEFRAME, (MPARAM)~0, 0);
         ::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
     {


@@ -782,14 +797,14 @@ bool wxTopLevelWindowOS2::Show(
         //
         if (GetParent())
         {
         //
         if (GetParent())
         {

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

 
             ::WinQueryWindowPos(hWndParent, &vSwp);
 
             ::WinQueryWindowPos(hWndParent, &vSwp);

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

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

-    return TRUE;
+    return true;

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


@@ -819,14 +834,21 @@ 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
 
 } // 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


@@ -836,9 +858,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
 


@@ -848,17 +870,28 @@ void wxTopLevelWindowOS2::Restore()
 } // end of wxTopLevelWindowOS2::Restore
 
 // generate an artificial resize event
 } // end of wxTopLevelWindowOS2::Restore
 
 // generate an artificial resize event

-void wxTopLevelWindowOS2::SendSizeEvent()
+void wxTopLevelWindowOS2::SendSizeEvent(int flags)

 {
     if (!m_bIconized)
     {
         RECTL                       vRect = wxGetWindowRect(GetHwnd());
 
 {
     if (!m_bIconized)
     {
         RECTL                       vRect = wxGetWindowRect(GetHwnd());
 

-        (void)::WinPostMsg( m_hFrame
-                           ,WM_SIZE
-                           ,MPFROM2SHORT(vRect.xRight - vRect.xLeft, vRect.yTop - vRect.yBottom)
-                           ,MPFROM2SHORT(vRect.xRight - vRect.xLeft, vRect.yTop - vRect.yBottom)
-                          );
+        if ( flags & wxSEND_EVENT_POST )
+        {
+            (void)::WinPostMsg( m_hFrame
+                               ,WM_SIZE
+                               ,MPFROM2SHORT(vRect.xRight - vRect.xLeft, vRect.yTop - vRect.yBottom)
+                               ,MPFROM2SHORT(vRect.xRight - vRect.xLeft, vRect.yTop - vRect.yBottom)
+                              );
+        }
+        else // send it
+        {
+            (void)::WinSendMsg( m_hFrame
+                               ,WM_SIZE
+                               ,MPFROM2SHORT(vRect.xRight - vRect.xLeft, vRect.yTop - vRect.yBottom)
+                               ,MPFROM2SHORT(vRect.xRight - vRect.xLeft, vRect.yTop - vRect.yBottom)
+                              );
+        }

     }
 } // end of wxTopLevelWindowOS2::SendSizeEvent
 
     }
 } // end of wxTopLevelWindowOS2::SendSizeEvent
 


@@ -866,17 +899,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;
 
         //


@@ -899,8 +930,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;


@@ -920,16 +951,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


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

-        wxSizeEvent                 vEvent( wxSize( nWidth
-                                                   ,nHeight
-                                                  )
-                                           ,GetId()
-                                          );
-
-        GetEventHandler()->ProcessEvent(vEvent);
-        return TRUE;
+        wxSize full( nWidth, nHeight );
+        wxSizeEvent vEvent( full, GetId() );
+        HandleWindowEvent(vEvent);
+        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


@@ -971,7 +996,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
 


@@ -979,13 +1004,6 @@ bool wxTopLevelWindowOS2::ShowFullScreen(
 // 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
 )


@@ -995,9 +1013,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.IsOk())

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


@@ -1012,19 +1030,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)
     {
 
     if (!hMenu)
     {

-        wxLogLastError(_T("GetSystemMenu"));
-        return FALSE;
+        wxLogLastError(wxT("GetSystemMenu"));
+        return false;

     }
 
     //
     }
 
     //


@@ -1052,7 +1068,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
 
 // ============================================================================


@@ -1066,7 +1082,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()


@@ -1075,7 +1091,7 @@ void wxTLWHiddenParentModule::OnExit()
     {
         if (!::WinDestroyWindow(m_shWnd))
         {
     {
         if (!::WinDestroyWindow(m_shWnd))
         {

-            wxLogLastError(_T("DestroyWindow(hidden TLW parent)"));
+            wxLogLastError(wxT("DestroyWindow(hidden TLW parent)"));

         }
         m_shWnd = NULL;
     }
         }
         m_shWnd = NULL;
     }


@@ -1090,39 +1106,38 @@ HWND wxTLWHiddenParentModule::GetHWND()
     {
         if (!m_szClassName)
         {
     {
         if (!m_szClassName)
         {

-            static const wxChar*    zHIDDEN_PARENT_CLASS = _T("wxTLWHiddenParent");
+            static const wxChar*    zHIDDEN_PARENT_CLASS = wxT("wxTLWHiddenParent");

 
             if (!::WinRegisterClass( wxGetInstance()
 
             if (!::WinRegisterClass( wxGetInstance()

-                                    ,zHIDDEN_PARENT_CLASS
+                                    ,(PSZ)zHIDDEN_PARENT_CLASS

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

-                wxLogLastError(_T("RegisterClass(\"wxTLWHiddenParent\")"));
+                wxLogLastError(wxT("RegisterClass(\"wxTLWHiddenParent\")"));

             }
             else
             {
                 m_szClassName = zHIDDEN_PARENT_CLASS;
             }
         }
             }
             else
             {
                 m_szClassName = zHIDDEN_PARENT_CLASS;
             }
         }

-        m_shWnd = ::WinCreateWindow( HWND_DESKTOP
-                                    ,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)
         {
         if (!m_shWnd)
         {

-            wxLogLastError(_T("CreateWindow(hidden TLW parent)"));
+            wxLogLastError(wxT("CreateWindow(hidden TLW parent)"));

         }
     }
     return m_shWnd;
         }
     }
     return m_shWnd;