X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0cf6acbf261c5d47f97d280700b1203f3d8d8047..d0eb7e56991881a0c5686c66d41c2e147fea03da:/src/os2/control.cpp diff --git a/src/os2/control.cpp b/src/os2/control.cpp index 592ea3f48e..acf4cecf2c 100644 --- 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