VTK wrapper of vtkRenderWindow for wxPython. Tested on MSW so far.

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

diff --git a/src/os2/frame.cpp b/src/os2/frame.cpp
index ec935b6d2429a8a8a0bb119ffb679ac92f10c2e9..3464ed330028b62f23b3698ef1e4545a2dec8bdc 100644 (file)
--- a/src/os2/frame.cpp
+++ b/src/os2/frame.cpp
@@ -3,7 +3,7 @@
 // Purpose:     wxFrame
 // Author:      David Webster
 // Modified by:
 // Purpose:     wxFrame
 // Author:      David Webster
 // Modified by:

-// Created:     08/12/99
+// Created:     10/27/99

 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
 // Licence:     wxWindows licence
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
 // Licence:     wxWindows licence


@@ -12,6 +12,10 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+

 #ifndef WX_PRECOMP
     #include "wx/setup.h"
     #include "wx/frame.h"
 #ifndef WX_PRECOMP
     #include "wx/setup.h"
     #include "wx/frame.h"


@@ -58,14 +62,13 @@ wxFrame::wxFrame()
   m_iconized = FALSE;
 }
 
   m_iconized = FALSE;
 }
 

-bool wxFrame::Create( wxWindow *parent
-                     ,wxWindowID id
-                     ,const wxString& title
-                     ,const wxPoint& pos
-                     ,const wxSize& size
-                     ,long style
-                     ,const wxString& name
-                    )
+bool wxFrame::Create(wxWindow *parent,
+           wxWindowID id,
+           const wxString& title,
+           const wxPoint& pos,
+           const wxSize& size,
+           long style,
+           const wxString& name)

 {
 #if wxUSE_TOOLTIPS
     m_hwndToolTip = 0;
 {
 #if wxUSE_TOOLTIPS
     m_hwndToolTip = 0;


@@ -94,6 +97,10 @@ bool wxFrame::Create( wxWindow *parent
 
   m_iconized = FALSE;
 
 
   m_iconized = FALSE;
 

+  // we pass NULL as parent to MSWCreate because frames with parents behave
+  // very strangely under Win95 shell
+  // Alteration by JACS: keep normal Windows behaviour (float on top of parent)
+  // with this style.

   if ((m_windowStyle & wxFRAME_FLOAT_ON_PARENT) == 0)
     parent = NULL;
 
   if ((m_windowStyle & wxFRAME_FLOAT_ON_PARENT) == 0)
     parent = NULL;
 


@@ -117,14 +124,16 @@ wxFrame::~wxFrame()
   if (m_frameMenuBar)
     delete m_frameMenuBar;
 
   if (m_frameMenuBar)
     delete m_frameMenuBar;
 

+/* New behaviour March 1998: check if it's the last top-level window */
+//  if (wxTheApp && (this == wxTheApp->GetTopWindow()))
+

   if (wxTheApp && (wxTopLevelWindows.Number() == 0))
   {
     wxTheApp->SetTopWindow(NULL);
 
     if (wxTheApp->GetExitOnFrameDelete())
     {
   if (wxTheApp && (wxTopLevelWindows.Number() == 0))
   {
     wxTheApp->SetTopWindow(NULL);
 
     if (wxTheApp->GetExitOnFrameDelete())
     {

-// TODO: PostQuitMessage(0);
-         return;
+//       PostQuitMessage(0);

     }
   }
 
     }
   }
 


@@ -135,28 +144,31 @@ wxFrame::~wxFrame()
   // Try to bring the parent to the top.
   // MT:Only do this if this frame is currently the active window, else weird
   // things start to happen
   // Try to bring the parent to the top.
   // MT:Only do this if this frame is currently the active window, else weird
   // things start to happen

+
+// TODO:
+/*

   if ( wxGetActiveWindow() == this )
   if ( wxGetActiveWindow() == this )

-    if (GetParent() && GetParent()->GetHWND())
-    // TODO: OS/2 PM version
-    //  ::BringWindowToTop((HWND) GetParent()->GetHWND());
-return;
+  if (GetParent() && GetParent()->GetHWND())
+    ::BringWindowToTop((HWND) GetParent()->GetHWND());
+*/

 }
 
 // Get size *available for subwindows* i.e. excluding menu bar, toolbar etc.
 void wxFrame::DoGetClientSize(int *x, int *y) const
 {
 }
 
 // Get size *available for subwindows* i.e. excluding menu bar, toolbar etc.
 void wxFrame::DoGetClientSize(int *x, int *y) const
 {

+// TODO:
+/*

   RECT rect;
   RECT rect;

-//TODO:  ::GetClientRect(GetHwnd(), &rect);
+  ::GetClientRect(GetHwnd(), &rect);

 
   if ( GetStatusBar() )
   {
     int statusX, statusY;
     GetStatusBar()->GetClientSize(&statusX, &statusY);
 
   if ( GetStatusBar() )
   {
     int statusX, statusY;
     GetStatusBar()->GetClientSize(&statusX, &statusY);

-// TODO: OS/2's rect    rect.bottom -= statusY;
+    rect.bottom -= statusY;

   }
 
   wxPoint pt(GetClientAreaOrigin());
   }
 
   wxPoint pt(GetClientAreaOrigin());

-/*

   rect.bottom -= pt.y;
   rect.right -= pt.x;
 
   rect.bottom -= pt.y;
   rect.right -= pt.x;
 


@@ -173,71 +185,79 @@ void wxFrame::DoSetClientSize(int width, int height)
 {
   HWND hWnd = GetHwnd();
 
 {
   HWND hWnd = GetHwnd();
 

+// TODO:
+/*

   RECT rect;
   RECT rect;

-// TODO:  ::GetClientRect(hWnd, &rect);
+  ::GetClientRect(hWnd, &rect);

 
   RECT rect2;
 
   RECT rect2;

-//TODO:  ::GetWindowRect(hWnd, &rect2);
+  GetWindowRect(hWnd, &rect2);

 
   // Find the difference between the entire window (title bar and all)
   // and the client area; add this to the new client size to move the
   // window
 
   // Find the difference between the entire window (title bar and all)
   // and the client area; add this to the new client size to move the
   // window

-/*

   int actual_width = rect2.right - rect2.left - rect.right + width;
   int actual_height = rect2.bottom - rect2.top - rect.bottom + height;
   int actual_width = rect2.right - rect2.left - rect.right + width;
   int actual_height = rect2.bottom - rect2.top - rect.bottom + height;

-*/
+

   if ( GetStatusBar() )
   {
     int statusX, statusY;
     GetStatusBar()->GetClientSize(&statusX, &statusY);
   if ( GetStatusBar() )
   {
     int statusX, statusY;
     GetStatusBar()->GetClientSize(&statusX, &statusY);

-//    actual_height += statusY;
+    actual_height += statusY;

   }
   }

-/*
+

   wxPoint pt(GetClientAreaOrigin());
   actual_width += pt.y;
   actual_height += pt.x;
 
   POINT point;
   wxPoint pt(GetClientAreaOrigin());
   actual_width += pt.y;
   actual_height += pt.x;
 
   POINT point;

-

   point.x = rect2.left;
   point.y = rect2.top;
 
   MoveWindow(hWnd, point.x, point.y, actual_width, actual_height, (BOOL)TRUE);
   point.x = rect2.left;
   point.y = rect2.top;
 
   MoveWindow(hWnd, point.x, point.y, actual_width, actual_height, (BOOL)TRUE);

-*/
+

   wxSizeEvent event(wxSize(width, height), m_windowId);
   event.SetEventObject( this );
   GetEventHandler()->ProcessEvent(event);
   wxSizeEvent event(wxSize(width, height), m_windowId);
   event.SetEventObject( this );
   GetEventHandler()->ProcessEvent(event);

+*/

 }
 
 void wxFrame::DoGetSize(int *width, int *height) const
 {
 }
 
 void wxFrame::DoGetSize(int *width, int *height) const
 {

+// TODO:
+/*

   RECT rect;
   RECT rect;

-// TODO:  ::GetWindowRect(GetHwnd(), &rect);
-//  *width = rect.right - rect.left;
-//  *height = rect.bottom - rect.top;
+  GetWindowRect(GetHwnd(), &rect);
+  *width = rect.right - rect.left;
+  *height = rect.bottom - rect.top;
+*/

 }
 
 void wxFrame::DoGetPosition(int *x, int *y) const
 {
 }
 
 void wxFrame::DoGetPosition(int *x, int *y) const
 {

+// TODO:
+/*

   RECT rect;
   RECT rect;

-// TODO:  ::GetWindowRect(GetHwnd(), &rect);
-  POINTL point;
-//  point.x = rect.left;
-//  point.y = rect.top;
+  GetWindowRect(GetHwnd(), &rect);
+  POINT point;
+  point.x = rect.left;
+  point.y = rect.top;

 
   *x = point.x;
   *y = point.y;
 
   *x = point.x;
   *y = point.y;

+*/

 }
 
 bool wxFrame::Show(bool show)
 {
 }
 
 bool wxFrame::Show(bool show)
 {

-  int cshow;
+// TODO:

 /*
 /*

+  int cshow;

   if (show)
     cshow = SW_SHOW;
   else
     cshow = SW_HIDE;
   if (show)
     cshow = SW_SHOW;
   else
     cshow = SW_HIDE;

-*/
+

   if (!show)
   {
     // Try to highlight the correct window (the parent)
   if (!show)
   {
     // Try to highlight the correct window (the parent)


@@ -246,70 +266,83 @@ bool wxFrame::Show(bool show)
     {
       hWndParent = (HWND) GetParent()->GetHWND();
       if (hWndParent)
     {
       hWndParent = (HWND) GetParent()->GetHWND();
       if (hWndParent)

-// TODO:        ::BringWindowToTop(hWndParent);
-        cshow = (int)show;  // just to have something here, remove
+        ::BringWindowToTop(hWndParent);

     }
   }
 
     }
   }
 

-// TODO:   ::ShowWindow(GetHwnd(), (BOOL)cshow);
+  ShowWindow(GetHwnd(), (BOOL)cshow);

   if (show)
   {
   if (show)
   {

-// TODO:    ::BringWindowToTop(GetHwnd());
+    BringWindowToTop(GetHwnd());

 
     wxActivateEvent event(wxEVT_ACTIVATE, TRUE, m_windowId);
     event.SetEventObject( this );
     GetEventHandler()->ProcessEvent(event);
   }
   return TRUE;
 
     wxActivateEvent event(wxEVT_ACTIVATE, TRUE, m_windowId);
     event.SetEventObject( this );
     GetEventHandler()->ProcessEvent(event);
   }
   return TRUE;

+*/
+  return FALSE;

 }
 
 void wxFrame::Iconize(bool iconize)
 {
 }
 
 void wxFrame::Iconize(bool iconize)
 {

+// TODO:
+/*

   if (!iconize)
     Show(TRUE);
 
   int cshow;
   if (!iconize)
     Show(TRUE);
 
   int cshow;

-/*

   if (iconize)
     cshow = SW_MINIMIZE;
   else
     cshow = SW_RESTORE;
   ShowWindow(GetHwnd(), (BOOL)cshow);
   if (iconize)
     cshow = SW_MINIMIZE;
   else
     cshow = SW_RESTORE;
   ShowWindow(GetHwnd(), (BOOL)cshow);

-*/

   m_iconized = iconize;
   m_iconized = iconize;

+*/

 }
 
 // Equivalent to maximize/restore in Windows
 void wxFrame::Maximize(bool maximize)
 {
 }
 
 // Equivalent to maximize/restore in Windows
 void wxFrame::Maximize(bool maximize)
 {

+// TODO:
+/*

   Show(TRUE);
   int cshow;
   Show(TRUE);
   int cshow;

-/*

   if (maximize)
     cshow = SW_MAXIMIZE;
   else
     cshow = SW_RESTORE;
   ShowWindow(GetHwnd(), cshow);
   if (maximize)
     cshow = SW_MAXIMIZE;
   else
     cshow = SW_RESTORE;
   ShowWindow(GetHwnd(), cshow);

-*/

   m_iconized = FALSE;
   m_iconized = FALSE;

+*/

 }
 
 bool wxFrame::IsIconized() const
 {
 }
 
 bool wxFrame::IsIconized() const
 {

-// TODO:  ((wxFrame *)this)->m_iconized = (::IsIconic(GetHwnd()) != 0);
+// TODO:
+/*
+  ((wxFrame *)this)->m_iconized = (::IsIconic(GetHwnd()) != 0);

   return m_iconized;
   return m_iconized;

+*/
+  return FALSE;

 }
 
 // Is it maximized?
 bool wxFrame::IsMaximized() const
 {
 }
 
 // Is it maximized?
 bool wxFrame::IsMaximized() const
 {

-//TODO:     return (::IsZoomed(GetHwnd()) != 0) ;
-    return FALSE; // remove
+//    return (::IsZoomed(GetHwnd()) != 0) ;
+  return FALSE;

 }
 
 void wxFrame::SetIcon(const wxIcon& icon)
 {
 }
 
 void wxFrame::SetIcon(const wxIcon& icon)
 {

+// TODO:
+/*

   m_icon = icon;
   m_icon = icon;

+  if ( m_icon.Ok() )
+    SendMessage(GetHwnd(), WM_SETICON,
+                (WPARAM)TRUE, (LPARAM)(HICON) m_icon.GetHICON());
+*/

 }
 
 #if wxUSE_STATUSBAR
 }
 
 #if wxUSE_STATUSBAR


@@ -317,21 +350,24 @@ wxStatusBar *wxFrame::OnCreateStatusBar(int number, long style, wxWindowID id,
     const wxString& name)
 {
     wxStatusBar *statusBar = NULL;
     const wxString& name)
 {
     wxStatusBar *statusBar = NULL;

+    {
+        statusBar = new wxStatusBar(this, id, wxPoint(0, 0), wxSize(100, 20),
+            style, name);
+
+        // Set the height according to the font and the border size
+        wxClientDC dc(statusBar);
+        dc.SetFont(statusBar->GetFont());

 
 

-    statusBar = new wxStatusBar(this, id, wxPoint(0, 0), wxSize(100, 20),
-                                style, name);
+        long x, y;
+        dc.GetTextExtent("X", &x, &y);

 
 

-    // Set the height according to the font and the border size
-    wxClientDC dc(statusBar);
-    dc.SetFont(statusBar->GetFont());
+        int height = (int)( (y  * 1.1) + 2* statusBar->GetBorderY());

 
 

-    long x, y;
-    dc.GetTextExtent("X", &x, &y);
+        statusBar->SetSize(-1, -1, 100, height);
+    }

 
 

-    int height = (int)( (y  * 1.1) + 2* statusBar->GetBorderY());
-    statusBar->SetSize(-1, -1, 100, height);
-    statusBar->SetFieldsCount(number);
-    return statusBar;
+  statusBar->SetFieldsCount(number);
+  return statusBar;

 }
 
 wxStatusBar* wxFrame::CreateStatusBar(int number, long style, wxWindowID id,
 }
 
 wxStatusBar* wxFrame::CreateStatusBar(int number, long style, wxWindowID id,


@@ -339,7 +375,7 @@ wxStatusBar* wxFrame::CreateStatusBar(int number, long style, wxWindowID id,
 {
   // VZ: calling CreateStatusBar twice is an error - why anyone would do it?
   wxCHECK_MSG( m_frameStatusBar == NULL, FALSE,
 {
   // VZ: calling CreateStatusBar twice is an error - why anyone would do it?
   wxCHECK_MSG( m_frameStatusBar == NULL, FALSE,

-               T("recreating status bar in wxFrame") );
+               wxT("recreating status bar in wxFrame") );

 
   m_frameStatusBar = OnCreateStatusBar(number, style, id,
     name);
 
   m_frameStatusBar = OnCreateStatusBar(number, style, id,
     name);


@@ -354,14 +390,14 @@ wxStatusBar* wxFrame::CreateStatusBar(int number, long style, wxWindowID id,
 
 void wxFrame::SetStatusText(const wxString& text, int number)
 {
 
 void wxFrame::SetStatusText(const wxString& text, int number)
 {

-  wxCHECK_RET( m_frameStatusBar != NULL, T("no statusbar to set text for") );
+  wxCHECK_RET( m_frameStatusBar != NULL, wxT("no statusbar to set text for") );

 
   m_frameStatusBar->SetStatusText(text, number);
 }
 
 void wxFrame::SetStatusWidths(int n, const int widths_field[])
 {
 
   m_frameStatusBar->SetStatusText(text, number);
 }
 
 void wxFrame::SetStatusWidths(int n, const int widths_field[])
 {

-  wxCHECK_RET( m_frameStatusBar != NULL, T("no statusbar to set widths for") );
+  wxCHECK_RET( m_frameStatusBar != NULL, wxT("no statusbar to set widths for") );

 
   m_frameStatusBar->SetStatusWidths(n, widths_field);
   PositionStatusBar();
 
   m_frameStatusBar->SetStatusWidths(n, widths_field);
   PositionStatusBar();


@@ -388,7 +424,7 @@ void wxFrame::DetachMenuBar()
 {
     if (m_frameMenuBar)
     {
 {
     if (m_frameMenuBar)
     {

-// Fix this in wxMenuBar        m_frameMenuBar->Detach();
+        m_frameMenuBar->Detach();

         m_frameMenuBar = NULL;
     }
 }
         m_frameMenuBar = NULL;
     }
 }


@@ -401,12 +437,12 @@ void wxFrame::SetMenuBar(wxMenuBar *menu_bar)
         return;
     }
 
         return;
     }
 

-// Fix this in wxMenuBar    wxCHECK_RET( !menu_bar->GetFrame(), T("this menubar is already attached") );
+    wxCHECK_RET( !menu_bar->GetFrame(), wxT("this menubar is already attached") );

 
     if (m_frameMenuBar)
         delete m_frameMenuBar;
 
 
     if (m_frameMenuBar)
         delete m_frameMenuBar;
 

-// Fix this in wxMenuBar   m_hMenu = menu_bar->Create();
+    m_hMenu = menu_bar->Create();

 
     if ( !m_hMenu )
         return;
 
     if ( !m_hMenu )
         return;


@@ -414,13 +450,14 @@ void wxFrame::SetMenuBar(wxMenuBar *menu_bar)
     InternalSetMenuBar();
 
     m_frameMenuBar = menu_bar;
     InternalSetMenuBar();
 
     m_frameMenuBar = menu_bar;

-// Fix this in wxMenuBar     menu_bar->Attach(this);
+    menu_bar->Attach(this);

 }
 
 void wxFrame::InternalSetMenuBar()
 {
 // TODO:
 }
 
 void wxFrame::InternalSetMenuBar()
 {
 // TODO:

-/*    if ( !::SetMenu(GetHwnd(), (HMENU)m_hMenu) )
+/*
+    if ( !::SetMenu(GetHwnd(), (HMENU)m_hMenu) )

     {
         wxLogLastError("SetMenu");
     }
     {
         wxLogLastError("SetMenu");
     }


@@ -457,6 +494,7 @@ bool wxFrame::OS2Create(int id, wxWindow *parent, const wxChar *wclass, wxWindow
 
   // If child windows aren't properly drawn initially, WS_CLIPCHILDREN
   // could be the culprit. But without it, you can get a lot of flicker.
 
   // If child windows aren't properly drawn initially, WS_CLIPCHILDREN
   // could be the culprit. But without it, you can get a lot of flicker.

+

 // TODO:
 /*
   DWORD msflags = 0;
 // TODO:
 /*
   DWORD msflags = 0;


@@ -509,7 +547,7 @@ bool wxFrame::OS2Create(int id, wxWindow *parent, const wxChar *wclass, wxWindow
     extendedStyle |= WS_EX_TOPMOST;
 
   m_iconized = FALSE;
     extendedStyle |= WS_EX_TOPMOST;
 
   m_iconized = FALSE;

-  if ( !wxWindow::OS2Create(id, parent, wclass, wx_win, title, x, y, width, height,
+  if ( !wxWindow::MSWCreate(id, parent, wclass, wx_win, title, x, y, width, height,

          msflags, NULL, extendedStyle) )
          return FALSE;
 
          msflags, NULL, extendedStyle) )
          return FALSE;
 


@@ -517,8 +555,10 @@ bool wxFrame::OS2Create(int id, wxWindow *parent, const wxChar *wclass, wxWindow
   // style instead of WS_OVERLAPPED
   if (width > -1 && height > -1)
     ::PostMessage(GetHwnd(), WM_SIZE, SIZE_RESTORED, MAKELPARAM(width, height));
   // style instead of WS_OVERLAPPED
   if (width > -1 && height > -1)
     ::PostMessage(GetHwnd(), WM_SIZE, SIZE_RESTORED, MAKELPARAM(width, height));

-*/
+

   return TRUE;
   return TRUE;

+*/
+  return FALSE;

 }
 
 // Default resizing behaviour - if only ONE subwindow, resize to client
 }
 
 // Default resizing behaviour - if only ONE subwindow, resize to client


@@ -621,13 +661,10 @@ void wxFrame::OnMenuHighlight(wxMenuEvent& event)
     if ( menuId != -1 )
     {
       wxMenuBar *menuBar = GetMenuBar();
     if ( menuId != -1 )
     {
       wxMenuBar *menuBar = GetMenuBar();

-// Fix this in wxMenuBar
-/*

       if (menuBar && menuBar->FindItem(menuId))
       {
         help = menuBar->GetHelpString(menuId);
       }
       if (menuBar && menuBar->FindItem(menuId))
       {
         help = menuBar->GetHelpString(menuId);
       }

-*/

     }
 
     // set status text even if the string is empty - this will at
     }
 
     // set status text even if the string is empty - this will at


@@ -648,7 +685,7 @@ bool wxFrame::ProcessCommand(int id)
     if ( !bar )
         return FALSE;
 
     if ( !bar )
         return FALSE;
 

-    wxMenuItem *item = bar->FindItemForId(id);
+    wxMenuItem *item = bar->FindItem(id);

 
     if ( item &&  item->IsCheckable() )
     {
 
     if ( item &&  item->IsCheckable() )
     {


@@ -683,9 +720,9 @@ wxPoint wxFrame::GetClientAreaOrigin() const
     return pt;
 }
 
     return pt;
 }
 

-void wxFrame::ScreenToClient(int *x, int *y) const
+void wxFrame::DoScreenToClient(int *x, int *y) const

 {
 {

-    wxWindow::ScreenToClient(x, y);
+    wxWindow::DoScreenToClient(x, y);

 
     // We may be faking the client origin.
     // So a window that's really at (0, 30) may appear
 
     // We may be faking the client origin.
     // So a window that's really at (0, 30) may appear


@@ -695,7 +732,7 @@ void wxFrame::ScreenToClient(int *x, int *y) const
     *y -= pt.y;
 }
 
     *y -= pt.y;
 }
 

-void wxFrame::ClientToScreen(int *x, int *y) const
+void wxFrame::DoClientToScreen(int *x, int *y) const

 {
     // We may be faking the client origin.
     // So a window that's really at (0, 30) may appear
 {
     // We may be faking the client origin.
     // So a window that's really at (0, 30) may appear


@@ -704,14 +741,14 @@ void wxFrame::ClientToScreen(int *x, int *y) const
     *x += pt1.x;
     *y += pt1.y;
 
     *x += pt1.x;
     *y += pt1.y;
 

-    wxWindow::ClientToScreen(x, y);
+    wxWindow::DoClientToScreen(x, y);

 }
 
 #if wxUSE_TOOLBAR
 wxToolBar* wxFrame::CreateToolBar(long style, wxWindowID id, const wxString& name)
 {
     wxCHECK_MSG( m_frameToolBar == NULL, FALSE,
 }
 
 #if wxUSE_TOOLBAR
 wxToolBar* wxFrame::CreateToolBar(long style, wxWindowID id, const wxString& name)
 {
     wxCHECK_MSG( m_frameToolBar == NULL, FALSE,

-                 T("recreating toolbar in wxFrame") );
+                 wxT("recreating toolbar in wxFrame") );

 
     wxToolBar* toolBar = OnCreateToolBar(style, id, name);
     if (toolBar)
 
     wxToolBar* toolBar = OnCreateToolBar(style, id, name);
     if (toolBar)


@@ -733,14 +770,16 @@ wxToolBar* wxFrame::OnCreateToolBar(long style, wxWindowID id, const wxString& n
 
 void wxFrame::PositionToolBar()
 {
 
 void wxFrame::PositionToolBar()
 {

+// TODO:
+/*

     RECT rect;
     RECT rect;

-// TODO:    ::GetClientRect(GetHwnd(), &rect);
+    ::GetClientRect(GetHwnd(), &rect);

 
     if ( GetStatusBar() )
     {
       int statusX, statusY;
       GetStatusBar()->GetClientSize(&statusX, &statusY);
 
     if ( GetStatusBar() )
     {
       int statusX, statusY;
       GetStatusBar()->GetClientSize(&statusX, &statusY);

-// TODO:      rect.bottom -= statusY;
+      rect.bottom -= statusY;

     }
 
     if (GetToolBar())
     }
 
     if (GetToolBar())


@@ -751,14 +790,15 @@ void wxFrame::PositionToolBar()
         if (GetToolBar()->GetWindowStyleFlag() & wxTB_VERTICAL)
         {
             // Use the 'real' MSW position
         if (GetToolBar()->GetWindowStyleFlag() & wxTB_VERTICAL)
         {
             // Use the 'real' MSW position

-            GetToolBar()->SetSize(0, 0, tw, rect.yBottom, wxSIZE_NO_ADJUSTMENTS);
+            GetToolBar()->SetSize(0, 0, tw, rect.bottom, wxSIZE_NO_ADJUSTMENTS);

         }
         else
         {
             // Use the 'real' MSW position
         }
         else
         {
             // Use the 'real' MSW position

-            GetToolBar()->SetSize(0, 0, rect.xRight, th, wxSIZE_NO_ADJUSTMENTS);
+            GetToolBar()->SetSize(0, 0, rect.right, th, wxSIZE_NO_ADJUSTMENTS);

         }
     }
         }
     }

+*/

 }
 #endif // wxUSE_TOOLBAR
 
 }
 #endif // wxUSE_TOOLBAR
 


@@ -804,17 +844,16 @@ void wxFrame::MakeModal(bool modal)
 
 bool wxFrame::OS2TranslateMessage(WXMSG* pMsg)
 {
 
 bool wxFrame::OS2TranslateMessage(WXMSG* pMsg)
 {

-// TODO:    if ( wxWindow::OS2TranslateMessage(pMsg) )
-//             return TRUE;
+    if ( wxWindow::OS2TranslateMessage(pMsg) )
+        return TRUE;

 
     // try the menu bar accels
     wxMenuBar *menuBar = GetMenuBar();
     if ( !menuBar )
         return FALSE;
 
 
     // try the menu bar accels
     wxMenuBar *menuBar = GetMenuBar();
     if ( !menuBar )
         return FALSE;
 

-// TODO:    const wxAcceleratorTable& acceleratorTable = menuBar->GetAccelTable();
-//    return acceleratorTable.Translate(this, pMsg);
-  return TRUE;
+    const wxAcceleratorTable& acceleratorTable = menuBar->GetAccelTable();
+    return acceleratorTable.Translate(this, pMsg);

 }
 
 // ---------------------------------------------------------------------------
 }
 
 // ---------------------------------------------------------------------------


@@ -823,60 +862,64 @@ bool wxFrame::OS2TranslateMessage(WXMSG* pMsg)
 
 bool wxFrame::HandlePaint()
 {
 
 bool wxFrame::HandlePaint()
 {

-    RECT rect;

 // TODO:
 // TODO:

-//    if ( GetUpdateRect(GetHwnd(), &rect, FALSE) )
-//    {
-//        if ( m_iconized )
-//        {
-//            HICON hIcon = m_icon.Ok() ? GetHiconOf(m_icon)
-//                                      : (HICON)m_defaultIcon;
-//
+/*
+    RECT rect;
+    if ( GetUpdateRect(GetHwnd(), &rect, FALSE) )
+    {
+        if ( m_iconized )
+        {
+            HICON hIcon = m_icon.Ok() ? GetHiconOf(m_icon)
+                                      : (HICON)m_defaultIcon;
+

             // Hold a pointer to the dc so long as the OnPaint() message
             // is being processed
             // Hold a pointer to the dc so long as the OnPaint() message
             // is being processed

-//
-//            PAINTSTRUCT ps;
-//            HDC hdc = ::BeginPaint(GetHwnd(), &ps);
-//            // Erase background before painting or we get white background
-//            OS2DefWindowProc(WM_ICONERASEBKGND, (WORD)(LONG)ps.hdc, 0L);
-//
-//            if ( hIcon )
-//            {
-//                RECT rect;
-// TODO:        ::GetClientRect(GetHwnd(), &rect);
+            PAINTSTRUCT ps;
+            HDC hdc = ::BeginPaint(GetHwnd(), &ps);
+
+            // Erase background before painting or we get white background
+            MSWDefWindowProc(WM_ICONERASEBKGND, (WORD)(LONG)ps.hdc, 0L);
+
+            if ( hIcon )
+            {
+                RECT rect;
+                ::GetClientRect(GetHwnd(), &rect);

 
                 // FIXME: why hardcoded?
 
                 // FIXME: why hardcoded?

-//                static const int icon_width = 32;
-//                static const int icon_height = 32;
-//
-//                int icon_x = (int)((rect.right - icon_width)/2);
-//                int icon_y = (int)((rect.bottom - icon_height)/2);
-//
-// TODO:                ::DrawIcon(hdc, icon_x, icon_y, hIcon);
-//            }
-//
-// TODO:    ::EndPaint(GetHwnd(), &ps);
-//
-//            return TRUE;
-//        }
-//        else
-//        {
-//            return wxWindow::HandlePaint();
-//        }
-//    }
-//    else
-//    {
-//        // nothing to paint - processed
-//        return TRUE;
-//    }
-       return TRUE;
+                static const int icon_width = 32;
+                static const int icon_height = 32;
+
+                int icon_x = (int)((rect.right - icon_width)/2);
+                int icon_y = (int)((rect.bottom - icon_height)/2);
+
+                ::DrawIcon(hdc, icon_x, icon_y, hIcon);
+            }
+
+            ::EndPaint(GetHwnd(), &ps);
+
+            return TRUE;
+        }
+        else
+        {
+            return wxWindow::HandlePaint();
+        }
+    }
+    else
+    {
+        // nothing to paint - processed
+        return TRUE;
+    }
+*/
+    return FALSE;

 }
 
 bool wxFrame::HandleSize(int x, int y, WXUINT id)
 {
     bool processed = FALSE;
 
 }
 
 bool wxFrame::HandleSize(int x, int y, WXUINT id)
 {
     bool processed = FALSE;
 

-/*    switch ( id )
+// TODO:
+/*
+    switch ( id )

     {
         case SIZENORMAL:
             // only do it it if we were iconized before, otherwise resizing the
     {
         case SIZENORMAL:
             // only do it it if we were iconized before, otherwise resizing the


@@ -904,6 +947,7 @@ bool wxFrame::HandleSize(int x, int y, WXUINT id)
 */
     if ( !m_iconized )
     {
 */
     if ( !m_iconized )
     {

+        // forward WM_SIZE to status bar control

         PositionStatusBar();
         PositionToolBar();
 
         PositionStatusBar();
         PositionToolBar();
 


@@ -922,8 +966,7 @@ bool wxFrame::HandleCommand(WXWORD id, WXWORD cmd, WXHWND control)
         // In case it's e.g. a toolbar.
         wxWindow *win = wxFindWinFromHandle(control);
         if ( win )
         // In case it's e.g. a toolbar.
         wxWindow *win = wxFindWinFromHandle(control);
         if ( win )

-// TODO:            return win->OS2Command(cmd, id);
-          return TRUE;
+            return win->OS2Command(cmd, id);

     }
 
     // handle here commands from menus and accelerators
     }
 
     // handle here commands from menus and accelerators


@@ -934,8 +977,7 @@ bool wxFrame::HandleCommand(WXWORD id, WXWORD cmd, WXHWND control)
             wxMenu *popupMenu = wxCurrentPopupMenu;
             wxCurrentPopupMenu = NULL;
 
             wxMenu *popupMenu = wxCurrentPopupMenu;
             wxCurrentPopupMenu = NULL;
 

-//            return popupMenu->OS2Command(cmd, id);
-               return TRUE;
+            return popupMenu->OS2Command(cmd, id);

         }
 
         if ( ProcessCommand(id) )
         }
 
         if ( ProcessCommand(id) )


@@ -955,6 +997,7 @@ bool wxFrame::HandleMenuSelect(WXWORD nItem, WXWORD flags, WXHMENU hMenu)
         // menu was removed from screen
         item = -1;
     }
         // menu was removed from screen
         item = -1;
     }

+// TODO:

 /*
     else if ( !(flags & MF_POPUP) && !(flags & MF_SEPARATOR) )
     {
 /*
     else if ( !(flags & MF_POPUP) && !(flags & MF_SEPARATOR) )
     {