Added SetToolNormalBitmap and SetToolDisabledBitmap

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

diff --git a/src/os2/control.cpp b/src/os2/control.cpp
index f829123a94c45d3a258969da25ae1975814ced1d..51eff786ee8367ce25756322c243caef4fbba3bb 100644 (file)
--- a/src/os2/control.cpp
+++ b/src/os2/control.cpp
@@ -12,6 +12,8 @@
 // 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
     #include "wx/event.h"
     #include "wx/app.h"
 #ifndef WX_PRECOMP
     #include "wx/event.h"
     #include "wx/app.h"


@@ -21,7 +23,6 @@
 #endif
 
 #include "wx/os2/private.h"
 #endif
 
 #include "wx/os2/private.h"

-#include "wx/control.h"

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


@@ -130,6 +131,9 @@ 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
                                        ,(PSZ)zClass              // Window class
                                        ,(PSZ)label.c_str()       // Initial Text
     m_hWnd = (WXHWND)::WinCreateWindow( (HWND)GetHwndOf(pParent) // Parent window handle
                                        ,(PSZ)zClass              // Window class
                                        ,(PSZ)label.c_str()       // Initial Text