reverted yet another accidental commit of testing code in r57505

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

diff --git a/src/os2/control.cpp b/src/os2/control.cpp
index 69a1a79243fe8eb75f2c7c0044949b644546efa1..0c53e236b9234cd18be7164ea879812b14db11b8 100644 (file)
--- a/src/os2/control.cpp
+++ b/src/os2/control.cpp
@@ -12,15 +12,18 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

+#include "wx/control.h"
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

-#include "wx/event.h"
-#include "wx/app.h"
-#include "wx/dcclient.h"
-#include "wx/scrolwin.h"
-#include "wx/log.h"
+    #include "wx/event.h"
+    #include "wx/app.h"
+    #include "wx/dcclient.h"
+    #include "wx/scrolwin.h"
+    #include "wx/log.h"

 #endif
 #endif

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

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

-#include "wx/control.h"

 
 IMPLEMENT_ABSTRACT_CLASS(wxControl, wxWindow)
 
 
 IMPLEMENT_ABSTRACT_CLASS(wxControl, wxWindow)
 


@@ -33,15 +36,13 @@ wxControl::wxControl()
 {
 } // end of wxControl::wxControl
 
 {
 } // end of wxControl::wxControl
 

-bool wxControl::Create(
-  wxWindow*                         pParent
-, wxWindowID                        vId
-, const wxPoint&                    rPos
-, const wxSize&                     rSize
-, long                              lStyle
-, const wxValidator&                rValidator
-, const wxString&                   rsName
-)
+bool wxControl::Create( wxWindow*           pParent,
+                        wxWindowID          vId,
+                        const wxPoint&      rPos,
+                        const wxSize&       rSize,
+                        long                lStyle,
+                        const wxValidator&  rValidator,
+                        const wxString&     rsName )

 {
     bool                            bRval = wxWindow::Create( pParent
                                                              ,vId
 {
     bool                            bRval = wxWindow::Create( pParent
                                                              ,vId


@@ -131,9 +132,12 @@ bool wxControl::OS2CreateControl( const wxChar*   zClassname,
     else
         label = m_label;
 
     else
         label = m_label;
 

+    // clipping siblings does not yet work
+    dwStyle &= ~WS_CLIPSIBLINGS;
+

     m_hWnd = (WXHWND)::WinCreateWindow( (HWND)GetHwndOf(pParent) // Parent window handle
     m_hWnd = (WXHWND)::WinCreateWindow( (HWND)GetHwndOf(pParent) // Parent window handle

-                                       ,(PSZ)zClass              // Window class
-                                       ,(PSZ)label.c_str()       // Initial Text
+                                       ,zClass              // Window class
+                                       ,label.c_str()       // Initial Text

                                        ,(ULONG)dwStyle           // Style flags
                                        ,(LONG)0                  // X pos of origin
                                        ,(LONG)0                  // Y pos of origin
                                        ,(ULONG)dwStyle           // Style flags
                                        ,(LONG)0                  // X pos of origin
                                        ,(LONG)0                  // Y pos of origin


@@ -181,7 +185,7 @@ wxSize wxControl::DoGetBestSize() const
 
 bool wxControl::ProcessCommand(wxCommandEvent& event)
 {
 
 bool wxControl::ProcessCommand(wxCommandEvent& event)
 {

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

 }
 
 WXHBRUSH wxControl::OnCtlColor(WXHDC    hWxDC,
 }
 
 WXHBRUSH wxControl::OnCtlColor(WXHDC    hWxDC,


@@ -212,7 +216,8 @@ WXHBRUSH wxControl::OnCtlColor(WXHDC    hWxDC,
 void wxControl::OnEraseBackground( wxEraseEvent& rEvent )
 {
     RECTL                           vRect;
 void wxControl::OnEraseBackground( wxEraseEvent& rEvent )
 {
     RECTL                           vRect;

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

     SIZEL                           vSize = {0,0};
 
     ::GpiSetPS(hPS, &vSize, PU_PELS | GPIF_DEFAULT);
     SIZEL                           vSize = {0,0};
 
     ::GpiSetPS(hPS, &vSize, PU_PELS | GPIF_DEFAULT);


@@ -224,7 +229,7 @@ WXDWORD wxControl::OS2GetStyle( long lStyle, WXDWORD* pdwExstyle ) const
 {
     long dwStyle = wxWindow::OS2GetStyle( lStyle, pdwExstyle );
 
 {
     long dwStyle = wxWindow::OS2GetStyle( lStyle, pdwExstyle );
 

-    if (AcceptsFocus())
+    if (AcceptsFocusFromKeyboard())

     {
         dwStyle |= WS_TABSTOP;
     }
     {
         dwStyle |= WS_TABSTOP;
     }


@@ -241,7 +246,7 @@ void wxControl::SetLabel( const wxString& rsLabel )
             label = ::wxPMTextToLabel(m_label);
         else
             label = m_label;
             label = ::wxPMTextToLabel(m_label);
         else
             label = m_label;

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

     }
 } // end of wxControl::SetLabel
 
     }
 } // end of wxControl::SetLabel