added stipple opaque mask detection

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

diff --git a/src/os2/control.cpp b/src/os2/control.cpp
index 592ea3f48e881157e69e95bf55e1067af77f9429..acf4cecf2c4e13dd507e13e2917e124de4c97daa 100644 (file)
--- a/src/os2/control.cpp
+++ b/src/os2/control.cpp
@@ -33,8 +33,6 @@ END_EVENT_TABLE()
 // Item members
 wxControl::wxControl()
 {
-  m_backgroundColour = *wxWHITE;
-  m_foregroundColour = *wxBLACK;
 
 #if WXWIN_COMPATIBILITY
   m_callback = 0;
@@ -136,15 +134,17 @@ bool wxControl::OS2CreateControl(
 
     if ((strcmp(zClassname, "COMBOBOX")) == 0)
         zClass = WC_COMBOBOX;
+    else if ((strcmp(zClassname, "STATIC")) == 0)
+        zClass = WC_STATIC;
     dwStyle |= WS_VISIBLE;
     m_hWnd = (WXHWND)::WinCreateWindow( (HWND)GetHwndOf(GetParent()) // Parent window handle
                                        ,(PSZ)zClassname              // Window class
                                        ,(PSZ)rsLabel.c_str()         // Initial Text
                                        ,(ULONG)dwStyle               // Style flags
-                                       ,(LONG)rPos.x                 // X pos of origin
-                                       ,(LONG)rPos.y                 // Y pos of origin
-                                       ,(LONG)rSize.x                // control width
-                                       ,(LONG)rSize.y                // control height
+                                       ,(LONG)0                      // X pos of origin
+                                       ,(LONG)0                      // Y pos of origin
+                                       ,(LONG)0                      // control width
+                                       ,(LONG)0                      // control height
                                        ,(HWND)GetHwndOf(GetParent()) // owner window handle (same as parent
                                        ,HWND_TOP                     // initial z position
                                        ,(ULONG)GetId()               // Window identifier