OSX regrouping

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

diff --git a/src/os2/window.cpp b/src/os2/window.cpp
index 2db19422f6d64662e5e418efe2e6d06c5cf9e17a..444a0756c2312a3224852fa1a1a630ac1fdde6c4 100644 (file)
--- a/src/os2/window.cpp
+++ b/src/os2/window.cpp
@@ -51,6 +51,8 @@
     #include <stdio.h>
 #endif
 
     #include <stdio.h>
 #endif
 

+#include "wx/os2/dcclient.h"
+

 #if wxUSE_OWNER_DRAWN
     #include "wx/ownerdrw.h"
 #endif
 #if wxUSE_OWNER_DRAWN
     #include "wx/ownerdrw.h"
 #endif


@@ -121,7 +123,7 @@
 QMSG                      s_currentMsg;
 
 #if wxUSE_MENUS_NATIVE
 QMSG                      s_currentMsg;
 
 #if wxUSE_MENUS_NATIVE

-wxMenu*                   wxCurrentPopupMenu = NULL;
+extern wxMenu*            wxCurrentPopupMenu;

 #endif // wxUSE_MENUS_NATIVE
 
 // ---------------------------------------------------------------------------
 #endif // wxUSE_MENUS_NATIVE
 
 // ---------------------------------------------------------------------------


@@ -295,7 +297,6 @@ void wxWindowOS2::Init()
     m_bUseCtl3D             = false;
     m_bMouseInWindow        = false;
     m_bLastKeydownProcessed = false;
     m_bUseCtl3D             = false;
     m_bMouseInWindow        = false;
     m_bLastKeydownProcessed = false;

-    m_pChildrenDisabled     = NULL;

 
     //
     // wxWnd
 
     //
     // wxWnd


@@ -357,7 +358,6 @@ wxWindowOS2::~wxWindowOS2()
         //
         wxRemoveHandleAssociation(this);
     }
         //
         wxRemoveHandleAssociation(this);
     }

-    delete m_pChildrenDisabled;

 } // end of wxWindowOS2::~wxWindowOS2
 
 // real construction (Init() must have been called before!)
 } // end of wxWindowOS2::~wxWindowOS2
 
 // real construction (Init() must have been called before!)


@@ -479,70 +479,12 @@ wxWindow* wxWindowBase::DoFindFocus()
     return NULL;
 } // wxWindowBase::DoFindFocus
 
     return NULL;
 } // wxWindowBase::DoFindFocus
 

-bool wxWindowOS2::Enable( bool bEnable )
+void wxWindowOS2::DoEnable( bool bEnable )

 {
 {

-    if (!wxWindowBase::Enable(bEnable))
-        return false;
-

     HWND                            hWnd = GetHwnd();
     HWND                            hWnd = GetHwnd();

-

     if ( hWnd )
         ::WinEnableWindow(hWnd, (BOOL)bEnable);
     if ( hWnd )
         ::WinEnableWindow(hWnd, (BOOL)bEnable);

-
-    //
-    // The logic below doesn't apply to the top level windows -- otherwise
-    // showing a modal dialog would result in total greying out (and ungreying
-    // out later) of everything which would be really ugly
-    //
-    if (IsTopLevel())
-        return true;
-
-    wxWindowList::compatibility_iterator     node = GetChildren().GetFirst();
-
-    while (node)
-    {
-        wxWindow*                   pChild = node->GetData();
-
-        if (bEnable)
-        {
-            //
-            // Enable the child back unless it had been disabled before us
-            //
-            if (!m_pChildrenDisabled || !m_pChildrenDisabled->Find(pChild))
-                pChild->Enable();
-        }
-        else // we're being disabled
-        {
-            if (pChild->IsEnabled())
-            {
-                //
-                // Disable it as children shouldn't stay enabled while the
-                // parent is not
-                //
-                pChild->Disable();
-            }
-            else // child already disabled, remember it
-            {
-                //
-                // Have we created the list of disabled children already?
-                //
-                if (!m_pChildrenDisabled)
-                    m_pChildrenDisabled = new wxWindowList;
-                m_pChildrenDisabled->Append(pChild);
-            }
-        }
-        node = node->GetNext();
-    }
-    if (bEnable && m_pChildrenDisabled)
-    {
-        //
-        // We don't need this list any more, don't keep unused memory
-        //
-        delete m_pChildrenDisabled;
-        m_pChildrenDisabled = NULL;
-    }
-    return true;
-} // end of wxWindowOS2::Enable
+}

 
 bool wxWindowOS2::Show( bool bShow )
 {
 
 bool wxWindowOS2::Show( bool bShow )
 {


@@ -572,7 +514,7 @@ void wxWindowOS2::Lower()
 
 void wxWindowOS2::SetLabel( const wxString& label )
 {
 
 void wxWindowOS2::SetLabel( const wxString& label )
 {

-    ::WinSetWindowText(GetHwnd(), (PSZ)label.c_str());
+    ::WinSetWindowText(GetHwnd(), label.c_str());

 } // end of wxWindowOS2::SetLabel
 
 wxString wxWindowOS2::GetLabel() const
 } // end of wxWindowOS2::SetLabel
 
 wxString wxWindowOS2::GetLabel() const


@@ -1142,7 +1084,7 @@ void wxWindowOS2::OnIdle(
                            ,vPoint.y
                            ,nState
                           );
                            ,vPoint.y
                            ,nState
                           );

-            (void)GetEventHandler()->ProcessEvent(rEvent);
+            (void)HandleWindowEvent(rEvent);

         }
     }
     if (wxUpdateUIEvent::CanUpdate(this))
         }
     }
     if (wxUpdateUIEvent::CanUpdate(this))


@@ -1152,7 +1094,7 @@ void wxWindowOS2::OnIdle(
 //
 // Set this window to be the child of 'parent'.
 //
 //
 // Set this window to be the child of 'parent'.
 //

-bool wxWindowOS2::Reparent( wxWindow* pParent)
+bool wxWindowOS2::Reparent( wxWindowBase* pParent)

 {
     if (!wxWindowBase::Reparent(pParent))
         return false;
 {
     if (!wxWindowBase::Reparent(pParent))
         return false;


@@ -1169,12 +1111,12 @@ void wxWindowOS2::Update()
     ::WinUpdateWindow(GetHwnd());
 } // end of wxWindowOS2::Update
 
     ::WinUpdateWindow(GetHwnd());
 } // end of wxWindowOS2::Update
 

-void wxWindowOS2::Freeze()
+void wxWindowOS2::DoFreeze()

 {
    ::WinSendMsg(GetHwnd(), WM_VRNDISABLED, (MPARAM)0, (MPARAM)0);
 } // end of wxWindowOS2::Freeze
 
 {
    ::WinSendMsg(GetHwnd(), WM_VRNDISABLED, (MPARAM)0, (MPARAM)0);
 } // end of wxWindowOS2::Freeze
 

-void wxWindowOS2::Thaw()
+void wxWindowOS2::DoThaw()

 {
    ::WinSendMsg(GetHwnd(), WM_VRNENABLED, (MPARAM)TRUE, (MPARAM)0);
 
 {
    ::WinSendMsg(GetHwnd(), WM_VRNENABLED, (MPARAM)TRUE, (MPARAM)0);
 


@@ -1680,7 +1622,7 @@ void wxWindowOS2::DoSetClientSize( int nWidth,
     wxSize size( nWidth, nHeight );
     wxSizeEvent vEvent( size, m_windowId );
     vEvent.SetEventObject(this);
     wxSize size( nWidth, nHeight );
     wxSizeEvent vEvent( size, m_windowId );
     vEvent.SetEventObject(this);

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

 } // end of wxWindowOS2::DoSetClientSize
 
 // ---------------------------------------------------------------------------
 } // end of wxWindowOS2::DoSetClientSize
 
 // ---------------------------------------------------------------------------


@@ -1733,7 +1675,6 @@ void wxWindowOS2::GetTextExtent( const wxString& rString,
     int         l;
     FONTMETRICS vFM; // metrics structure
     BOOL        bRc = FALSE;
     int         l;
     FONTMETRICS vFM; // metrics structure
     BOOL        bRc = FALSE;

-    char*       pStr;

     HPS         hPS;
 
     hPS = ::WinGetPS(GetHwnd());
     HPS         hPS;
 
     hPS = ::WinGetPS(GetHwnd());


@@ -1741,14 +1682,12 @@ void wxWindowOS2::GetTextExtent( const wxString& rString,
     l = rString.length();
     if (l > 0L)
     {
     l = rString.length();
     if (l > 0L)
     {

-        pStr = (PCH)rString.c_str();
-

         //
         // In world coordinates.
         //
         bRc = ::GpiQueryTextBox( hPS,
                                  l,
         //
         // In world coordinates.
         //
         bRc = ::GpiQueryTextBox( hPS,
                                  l,

-                                 pStr,
+                                 (char*) rString.wx_str(),

                                  TXTBOX_COUNT,// return maximum information
                                  avPoint      // array of coordinates points
                                 );
                                  TXTBOX_COUNT,// return maximum information
                                  avPoint      // array of coordinates points
                                 );


@@ -1847,10 +1786,6 @@ bool wxWindowOS2::DoPopupMenu( wxMenu* pMenu, int nX, int nY )
     bool bIsWaiting = true;
     int nHeight;
 
     bool bIsWaiting = true;
     int nHeight;
 

-    // Protect against recursion
-    if (wxCurrentPopupMenu)
-        return false;
-

     pMenu->SetInvokingWindow(this);
     pMenu->UpdateUI();
 
     pMenu->SetInvokingWindow(this);
     pMenu->UpdateUI();
 


@@ -1867,7 +1802,6 @@ bool wxWindowOS2::DoPopupMenu( wxMenu* pMenu, int nX, int nY )
         DoGetSize(0,&nHeight);
         nY = nHeight - nY;
     }
         DoGetSize(0,&nHeight);
         nY = nHeight - nY;
     }

-    wxCurrentPopupMenu = pMenu;

 
     ::WinPopupMenu( hWndParent
                    ,hWndOwner
 
     ::WinPopupMenu( hWndParent
                    ,hWndOwner


@@ -1888,7 +1822,6 @@ bool wxWindowOS2::DoPopupMenu( wxMenu* pMenu, int nX, int nY )
         ::WinDispatchMsg(vHabmain, (PQMSG)&vMsg);
     }
 
         ::WinDispatchMsg(vHabmain, (PQMSG)&vMsg);
     }
 

-    wxCurrentPopupMenu = NULL;

     pMenu->SetInvokingWindow(NULL);
     return true;
 } // end of wxWindowOS2::DoPopupMenu
     pMenu->SetInvokingWindow(NULL);
     return true;
 } // end of wxWindowOS2::DoPopupMenu


@@ -2064,7 +1997,7 @@ bool wxWindowOS2::OS2ProcessMessage( WXMSG* pMsg )
                 vEvent.SetWindowChange(bWindowChange);
                 vEvent.SetEventObject(this);
 
                 vEvent.SetWindowChange(bWindowChange);
                 vEvent.SetEventObject(this);
 

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

                 {
                     wxButton*       pBtn = wxDynamicCast(FindFocus(), wxButton);
 
                 {
                     wxButton*       pBtn = wxDynamicCast(FindFocus(), wxButton);
 


@@ -2418,7 +2351,7 @@ MRESULT wxWindowOS2::OS2WindowProc( WXUINT uMsg,
                                                                   );
                     if (!pWin->IsOfStandardClass())
                     {
                                                                   );
                     if (!pWin->IsOfStandardClass())
                     {

-                        if (uMsg == WM_BUTTON1DOWN && pWin->AcceptsFocus() )
+                        if (uMsg == WM_BUTTON1DOWN && pWin->CanAcceptFocus() )

                             pWin->SetFocus();
                     }
                     bProcessed = pWin->HandleMouseEvent( uMsg
                             pWin->SetFocus();
                     }
                     bProcessed = pWin->HandleMouseEvent( uMsg


@@ -2641,6 +2574,7 @@ MRESULT wxWindowOS2::OS2WindowProc( WXUINT uMsg,
                     }
                     break;
 
                     }
                     break;
 

+                case CBN_LBSELECT:

                 case BN_CLICKED: // Dups as LN_SELECT and CBN_LBSELECT
                     {
                         HWND                hWnd = ::WinWindowFromID((HWND)GetHwnd(), SHORT1FROMMP(wParam));
                 case BN_CLICKED: // Dups as LN_SELECT and CBN_LBSELECT
                     {
                         HWND                hWnd = ::WinWindowFromID((HWND)GetHwnd(), SHORT1FROMMP(wParam));


@@ -2697,11 +2631,19 @@ MRESULT wxWindowOS2::OS2WindowProc( WXUINT uMsg,
                                                   ,(WXWORD)SHORT1FROMMP(wParam)
                                                  );
                         }
                                                   ,(WXWORD)SHORT1FROMMP(wParam)
                                                  );
                         }

+                        if (pWin->IsKindOf(CLASSINFO(wxChoice)))
+                        {
+                            wxChoice*           pChoice = wxDynamicCast(pWin, wxChoice);
+
+                            pChoice->OS2Command( (WXUINT)SHORT2FROMMP(wParam)
+                                                ,(WXWORD)SHORT1FROMMP(wParam)
+                                               );
+                        }

                         return 0;
                     }
                     // break;
 
                         return 0;
                     }
                     // break;
 

-                case LN_ENTER:   /* dups as CBN_EFCHANGE */
+                case LN_ENTER:

                     {
                         HWND                hWnd = HWNDFROMMP(lParam);
                         wxWindowOS2*        pWin = wxFindWinFromHandle(hWnd);
                     {
                         HWND                hWnd = HWNDFROMMP(lParam);
                         wxWindowOS2*        pWin = wxFindWinFromHandle(hWnd);


@@ -2995,6 +2937,7 @@ bool wxWindowOS2::OS2Create( PSZ            zClass,
     long                 lControlId = 0L;
     wxWindowCreationHook vHook(this);
     wxString             sClassName((wxChar*)zClass);
     long                 lControlId = 0L;
     wxWindowCreationHook vHook(this);
     wxString             sClassName((wxChar*)zClass);

+    wxString             sTitle(zTitle ? zTitle : wxEmptyString);

 
     OS2GetCreateWindowCoords( rPos
                              ,rSize
 
     OS2GetCreateWindowCoords( rPos
                              ,rSize


@@ -3022,8 +2965,8 @@ bool wxWindowOS2::OS2Create( PSZ            zClass,
         sClassName += wxT("NR");
     }
     m_hWnd = (WXHWND)::WinCreateWindow( (HWND)OS2GetParent()
         sClassName += wxT("NR");
     }
     m_hWnd = (WXHWND)::WinCreateWindow( (HWND)OS2GetParent()

-                                       ,(PSZ)sClassName.c_str()
-                                       ,(PSZ)(zTitle ? zTitle : wxEmptyString)
+                                       ,sClassName.c_str()
+                                       ,sTitle.c_str()

                                        ,(ULONG)dwStyle
                                        ,(LONG)0L
                                        ,(LONG)0L
                                        ,(ULONG)dwStyle
                                        ,(LONG)0L
                                        ,(LONG)0L


@@ -3080,7 +3023,7 @@ bool wxWindowOS2::HandleCreate( WXLPCREATESTRUCT WXUNUSED(vCs),
 {
     wxWindowCreateEvent             vEvent((wxWindow*)this);
 
 {
     wxWindowCreateEvent             vEvent((wxWindow*)this);
 

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

     *pbMayCreate = true;
     return true;
 } // end of wxWindowOS2::HandleCreate
     *pbMayCreate = true;
     return true;
 } // end of wxWindowOS2::HandleCreate


@@ -3089,7 +3032,7 @@ bool wxWindowOS2::HandleDestroy()
 {
     wxWindowDestroyEvent            vEvent((wxWindow*)this);
     vEvent.SetId(GetId());
 {
     wxWindowDestroyEvent            vEvent((wxWindow*)this);
     vEvent.SetId(GetId());

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

 
     //
     // Delete our drop target if we've got one
 
     //
     // Delete our drop target if we've got one


@@ -3128,7 +3071,7 @@ bool wxWindowOS2::HandleActivate(
                                            ,m_windowId
                                           );
     vEvent.SetEventObject(this);
                                            ,m_windowId
                                           );
     vEvent.SetEventObject(this);

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

 } // end of wxWindowOS2::HandleActivate
 
 bool wxWindowOS2::HandleSetFocus( WXHWND WXUNUSED(hWnd) )
 } // end of wxWindowOS2::HandleActivate
 
 bool wxWindowOS2::HandleSetFocus( WXHWND WXUNUSED(hWnd) )


@@ -3138,7 +3081,7 @@ bool wxWindowOS2::HandleSetFocus( WXHWND WXUNUSED(hWnd) )
     // purposes that we got it
     //
     wxChildFocusEvent               vEventFocus((wxWindow *)this);
     // purposes that we got it
     //
     wxChildFocusEvent               vEventFocus((wxWindow *)this);

-    (void)GetEventHandler()->ProcessEvent(vEventFocus);
+    (void)HandleWindowEvent(vEventFocus);

 
 #if wxUSE_CARET
     //
 
 #if wxUSE_CARET
     //


@@ -3162,7 +3105,7 @@ bool wxWindowOS2::HandleSetFocus( WXHWND WXUNUSED(hWnd) )
     wxFocusEvent                    vEvent(wxEVT_SET_FOCUS, m_windowId);
 
     vEvent.SetEventObject(this);
     wxFocusEvent                    vEvent(wxEVT_SET_FOCUS, m_windowId);
 
     vEvent.SetEventObject(this);

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

 } // end of wxWindowOS2::HandleSetFocus
 
 bool wxWindowOS2::HandleKillFocus( WXHWND hWnd )
 } // end of wxWindowOS2::HandleSetFocus
 
 bool wxWindowOS2::HandleKillFocus( WXHWND hWnd )


@@ -3209,7 +3152,7 @@ bool wxWindowOS2::HandleKillFocus( WXHWND hWnd )
     // wxFindWinFromHandle() may return NULL, it is ok
     //
     vEvent.SetWindow(wxFindWinFromHandle(hWnd));
     // wxFindWinFromHandle() may return NULL, it is ok
     //
     vEvent.SetWindow(wxFindWinFromHandle(hWnd));

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

 } // end of wxWindowOS2::HandleKillFocus
 
 // ---------------------------------------------------------------------------
 } // end of wxWindowOS2::HandleKillFocus
 
 // ---------------------------------------------------------------------------


@@ -3224,7 +3167,7 @@ bool wxWindowOS2::HandleShow(
     wxShowEvent                     vEvent(GetId(), bShow);
 
     vEvent.SetEventObject(this);
     wxShowEvent                     vEvent(GetId(), bShow);
 
     vEvent.SetEventObject(this);

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

 } // end of wxWindowOS2::HandleShow
 
 bool wxWindowOS2::HandleInitDialog( WXHWND WXUNUSED(hWndFocus) )
 } // end of wxWindowOS2::HandleShow
 
 bool wxWindowOS2::HandleInitDialog( WXHWND WXUNUSED(hWndFocus) )


@@ -3232,7 +3175,7 @@ bool wxWindowOS2::HandleInitDialog( WXHWND WXUNUSED(hWndFocus) )
     wxInitDialogEvent               vEvent(GetId());
 
     vEvent.SetEventObject(this);
     wxInitDialogEvent               vEvent(GetId());
 
     vEvent.SetEventObject(this);

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

 } // end of wxWindowOS2::HandleInitDialog
 
 bool wxWindowOS2::HandleEndDrag(WXWPARAM WXUNUSED(wParam))
 } // end of wxWindowOS2::HandleInitDialog
 
 bool wxWindowOS2::HandleEndDrag(WXWPARAM WXUNUSED(wParam))


@@ -3259,7 +3202,7 @@ bool wxWindowOS2::OS2OnDrawItem( int vId,
                                  WXDRAWITEMSTRUCT* pItemStruct )
 {
 #if wxUSE_OWNER_DRAWN
                                  WXDRAWITEMSTRUCT* pItemStruct )
 {
 #if wxUSE_OWNER_DRAWN

-    wxDC                            vDc;
+    wxClientDC                      vDc(this);

 
 #if wxUSE_MENUS_NATIVE
     //
 
 #if wxUSE_MENUS_NATIVE
     //


@@ -3278,8 +3221,10 @@ bool wxWindowOS2::OS2OnDrawItem( int vId,
                                           ,pMeasureStruct->rclItem.xRight - pMeasureStruct->rclItem.xLeft
                                           ,pMeasureStruct->rclItem.yTop - pMeasureStruct->rclItem.yBottom
                                          );
                                           ,pMeasureStruct->rclItem.xRight - pMeasureStruct->rclItem.xLeft
                                           ,pMeasureStruct->rclItem.yTop - pMeasureStruct->rclItem.yBottom
                                          );

-        vDc.SetHDC( hDC, false );
-        vDc.SetHPS( pMeasureStruct->hps );
+
+       wxPMDCImpl *impl = (wxPMDCImpl*) vDc.GetImpl();
+        impl->SetHDC( hDC, false );
+        impl->SetHPS( pMeasureStruct->hps );

         //
         // Load the wxWidgets Pallete and set to RGB mode
         //
         //
         // Load the wxWidgets Pallete and set to RGB mode
         //


@@ -3469,7 +3414,7 @@ bool wxWindowOS2::HandleSysColorChange()
     wxSysColourChangedEvent         vEvent;
 
     vEvent.SetEventObject(this);
     wxSysColourChangedEvent         vEvent;
 
     vEvent.SetEventObject(this);

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

 } // end of wxWindowOS2::HandleSysColorChange
 
 bool wxWindowOS2::HandleCtlColor( WXHBRUSH* WXUNUSED(phBrush) )
 } // end of wxWindowOS2::HandleSysColorChange
 
 bool wxWindowOS2::HandleCtlColor( WXHBRUSH* WXUNUSED(phBrush) )


@@ -3502,7 +3447,7 @@ bool wxWindowOS2::HandlePaletteChanged()
     vEvent.SetEventObject(this);
     vEvent.SetChangedWindow(wxFindWinFromHandle(hWndPalChange));
 
     vEvent.SetEventObject(this);
     vEvent.SetChangedWindow(wxFindWinFromHandle(hWndPalChange));
 

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

 } // end of wxWindowOS2::HandlePaletteChanged
 
 //
 } // end of wxWindowOS2::HandlePaletteChanged
 
 //


@@ -3526,7 +3471,7 @@ void wxWindowOS2::OnSysColourChanged(
             wxSysColourChangedEvent vEvent;
 
             rEvent.SetEventObject(pWin);
             wxSysColourChangedEvent vEvent;
 
             rEvent.SetEventObject(pWin);

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

         }
         node = node->GetNext();
     }
         }
         node = node->GetNext();
     }


@@ -3540,7 +3485,7 @@ void wxWindow::OnPaint (
   wxPaintEvent&                     rEvent
 )
 {
   wxPaintEvent&                     rEvent
 )
 {

-    HDC                             hDC = (HDC)wxPaintDC::FindDCInCache((wxWindow*) rEvent.GetEventObject());
+    HDC                             hDC = (HDC)wxPaintDCImpl::FindDCInCache((wxWindow*) rEvent.GetEventObject());

 
     if (hDC != 0)
     {
 
     if (hDC != 0)
     {


@@ -3568,15 +3513,10 @@ bool wxWindowOS2::HandlePaint()
          wxLogLastError(wxT("CreateRectRgn"));
          return false;
     }
          wxLogLastError(wxT("CreateRectRgn"));
          return false;
     }

-

     // Get all the rectangles from the region, convert the individual
     // rectangles to "the other" coordinate system and reassemble a
     // region from the rectangles, to be feed into m_updateRegion.
     //
     // Get all the rectangles from the region, convert the individual
     // rectangles to "the other" coordinate system and reassemble a
     // region from the rectangles, to be feed into m_updateRegion.
     //

-    // FIXME: This is a bad hack since OS/2 API specifies that rectangles
-    //        passed into GpiSetRegion must not have Bottom > Top,
-    //        however, at first sight, it _seems_ to work nonetheless.
-    //

     RGNRECT                     vRgnData;
     PRECTL                      pUpdateRects = NULL;
     vRgnData.ulDirection = RECTDIR_LFRT_TOPBOT;
     RGNRECT                     vRgnData;
     PRECTL                      pUpdateRects = NULL;
     vRgnData.ulDirection = RECTDIR_LFRT_TOPBOT;


@@ -3606,18 +3546,17 @@ bool wxWindowOS2::HandlePaint()
             {
                 int                 rectHeight;
                 rectHeight = pUpdateRects[i].yTop - pUpdateRects[i].yBottom;
             {
                 int                 rectHeight;
                 rectHeight = pUpdateRects[i].yTop - pUpdateRects[i].yBottom;

-                pUpdateRects[i].yTop = height - pUpdateRects[i].yTop;
-                pUpdateRects[i].yBottom = pUpdateRects[i].yTop + rectHeight;
+                pUpdateRects[i].yBottom = height - pUpdateRects[i].yTop;
+                pUpdateRects[i].yTop = pUpdateRects[i].yBottom + rectHeight;

             }
             ::GpiSetRegion(hPS, hRgn, vRgnData.crc, pUpdateRects);
             delete [] pUpdateRects;
         }
     }
             }
             ::GpiSetRegion(hPS, hRgn, vRgnData.crc, pUpdateRects);
             delete [] pUpdateRects;
         }
     }

-

     m_updateRegion = wxRegion(hRgn, hPS);
 
     vEvent.SetEventObject(this);
     m_updateRegion = wxRegion(hRgn, hPS);
 
     vEvent.SetEventObject(this);

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

 
     if (!bProcessed &&
          IsKindOf(CLASSINFO(wxPanel)) &&
 
     if (!bProcessed &&
          IsKindOf(CLASSINFO(wxPanel)) &&


@@ -3731,25 +3670,26 @@ bool wxWindowOS2::HandleEraseBkgnd( WXHDC hDC )
     if (vSwp.fl & SWP_MINIMIZE)
         return true;
 
     if (vSwp.fl & SWP_MINIMIZE)
         return true;
 

-    wxDC vDC;
-
-    vDC.m_hPS = (HPS)hDC; // this is really a PS
-    vDC.SetWindow((wxWindow*)this);
+    wxClientDC vDC(this);
+    wxPMDCImpl *impl = (wxPMDCImpl*) vDC.GetImpl();
+    impl->SetHDC(hDC);
+    impl->SetHPS((HPS)hDC); // this is really a PS

 
     wxEraseEvent vEvent(m_windowId, &vDC);
 
     vEvent.SetEventObject(this);
 
 
     wxEraseEvent vEvent(m_windowId, &vDC);
 
     vEvent.SetEventObject(this);
 

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

 
 

-    vDC.m_hPS = NULLHANDLE;
+    impl->SetHPS(NULLHANDLE);

     return true;
 } // end of wxWindowOS2::HandleEraseBkgnd
 
 void wxWindowOS2::OnEraseBackground(wxEraseEvent& rEvent)
 {
     RECTL   vRect;
     return true;
 } // end of wxWindowOS2::HandleEraseBkgnd
 
 void wxWindowOS2::OnEraseBackground(wxEraseEvent& rEvent)
 {
     RECTL   vRect;

-    HPS     hPS = rEvent.GetDC()->GetHPS();
+    wxPMDCImpl *impl = (wxPMDCImpl*) rEvent.GetDC()->GetImpl();
+    HPS     hPS = impl->GetHPS();

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


@@ -3766,7 +3706,7 @@ bool wxWindowOS2::HandleMinimize()
     wxIconizeEvent                  vEvent(m_windowId);
 
     vEvent.SetEventObject(this);
     wxIconizeEvent                  vEvent(m_windowId);
 
     vEvent.SetEventObject(this);

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

 } // end of wxWindowOS2::HandleMinimize
 
 bool wxWindowOS2::HandleMaximize()
 } // end of wxWindowOS2::HandleMinimize
 
 bool wxWindowOS2::HandleMaximize()


@@ -3774,7 +3714,7 @@ bool wxWindowOS2::HandleMaximize()
     wxMaximizeEvent                 vEvent(m_windowId);
 
     vEvent.SetEventObject(this);
     wxMaximizeEvent                 vEvent(m_windowId);
 
     vEvent.SetEventObject(this);

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

 } // end of wxWindowOS2::HandleMaximize
 
 bool wxWindowOS2::HandleMove( int nX, int nY )
 } // end of wxWindowOS2::HandleMaximize
 
 bool wxWindowOS2::HandleMove( int nX, int nY )


@@ -3783,7 +3723,7 @@ bool wxWindowOS2::HandleMove( int nX, int nY )
     wxMoveEvent vEvent(pt, m_windowId);
 
     vEvent.SetEventObject(this);
     wxMoveEvent vEvent(pt, m_windowId);
 
     vEvent.SetEventObject(this);

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

 }  // end of wxWindowOS2::HandleMove
 
 bool wxWindowOS2::HandleSize( int    nWidth,
 }  // end of wxWindowOS2::HandleMove
 
 bool wxWindowOS2::HandleSize( int    nWidth,


@@ -3794,7 +3734,7 @@ bool wxWindowOS2::HandleSize( int    nWidth,
     wxSizeEvent vEvent(sz, m_windowId);
 
     vEvent.SetEventObject(this);
     wxSizeEvent vEvent(sz, m_windowId);
 
     vEvent.SetEventObject(this);

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

 } // end of wxWindowOS2::HandleSize
 
 bool wxWindowOS2::HandleGetMinMaxInfo( PSWP pSwp )
 } // end of wxWindowOS2::HandleSize
 
 bool wxWindowOS2::HandleGetMinMaxInfo( PSWP pSwp )


@@ -3939,7 +3879,7 @@ bool wxWindowOS2::HandleMouseEvent( WXUINT uMsg,
                        ,uFlags
                        );
 
                        ,uFlags
                        );
 

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

         if (!bProcessed)
         {
             HPOINTER hCursor = (HPOINTER)GetCursor().GetHCURSOR();
         if (!bProcessed)
         {
             HPOINTER hCursor = (HPOINTER)GetCursor().GetHCURSOR();


@@ -3973,7 +3913,7 @@ bool wxWindowOS2::HandleMouseMove( int nX,
                        ,uFlags
                       );
 
                        ,uFlags
                       );
 

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

     }
     return HandleMouseEvent( WM_MOUSEMOVE
                             ,nX
     }
     return HandleMouseEvent( WM_MOUSEMOVE
                             ,nX


@@ -4095,7 +4035,7 @@ bool wxWindowOS2::HandleChar( WXWPARAM WXUNUSED(wParam),
         vEvent.m_controlDown = true;
     }
 
         vEvent.m_controlDown = true;
     }
 

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

 }
 
 bool wxWindowOS2::HandleKeyDown( WXWPARAM wParam,
 }
 
 bool wxWindowOS2::HandleKeyDown( WXWPARAM wParam,


@@ -4119,7 +4059,7 @@ bool wxWindowOS2::HandleKeyDown( WXWPARAM wParam,
                                           ,(MPARAM)wParam
                                          ));
 
                                           ,(MPARAM)wParam
                                          ));
 

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

         {
             return true;
         }
         {
             return true;
         }


@@ -4148,7 +4088,7 @@ bool wxWindowOS2::HandleKeyUp( WXWPARAM wParam,
                                          ,(MPARAM)wParam
                                         ));
 
                                          ,(MPARAM)wParam
                                         ));
 

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

             return true;
     }
     return false;
             return true;
     }
     return false;


@@ -4214,7 +4154,7 @@ bool wxWindowOS2::OS2OnScroll( int nOrientation,
         default:
             return false;
     }
         default:
             return false;
     }

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

 } // end of wxWindowOS2::OS2OnScroll
 
 //
 } // end of wxWindowOS2::OS2OnScroll
 
 //