don't use wxFileConfig to parse kdeglobals, it's not meant for such use. Fixes bug...

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

diff --git a/src/os2/control.cpp b/src/os2/control.cpp
index d8c0373c11e468ac060fe10d3eeffeb1f2a6525a..f390b9c38bcd051dade60380c0e7f6ff62f2ff5a 100644 (file)
--- a/src/os2/control.cpp
+++ b/src/os2/control.cpp
@@ -99,14 +99,13 @@ bool wxControl::OS2CreateControl(
 , WXDWORD                           dwExstyle
 )
 {
 , WXDWORD                           dwExstyle
 )
 {

-    bool                            bWant3D = FALSE;
-

     //
     // Doesn't do anything at all under OS/2
     //
     if (dwExstyle == (WXDWORD)-1)
     {
     //
     // Doesn't do anything at all under OS/2
     //
     if (dwExstyle == (WXDWORD)-1)
     {

-        dwExstyle = Determine3DEffects(WS_EX_CLIENTEDGE, &bWant3D);
+        dwExstyle = 0;
+       (void) OS2GetStyle(GetWindowStyle(), &dwExstyle);

     }
     //
     // All controls should have these styles (wxWindows creates all controls
     }
     //
     // All controls should have these styles (wxWindows creates all controls


@@ -162,9 +161,14 @@ bool wxControl::OS2CreateControl(
     SubclassWin(m_hWnd);
 
     //
     SubclassWin(m_hWnd);
 
     //

-    // Controls use the same font and colours as their parent dialog by default
+    // Controls use the same colours as their parent dialog by default

     //
     InheritAttributes();
     //
     InheritAttributes();

+    //
+    // All OS/2 ctrls use the small font
+    //
+    SetFont(*wxSMALL_FONT);
+

     SetXComp(0);
     SetYComp(0);
     SetSize( rPos.x
     SetXComp(0);
     SetYComp(0);
     SetSize( rPos.x


@@ -241,6 +245,15 @@ WXDWORD wxControl::OS2GetStyle(
     return dwStyle;
 } // end of wxControl::OS2GetStyle
 
     return dwStyle;
 } // end of wxControl::OS2GetStyle
 

+void wxControl::SetLabel(
+  const wxString&                   rsLabel
+)
+{
+    wxString                        sLabel = ::wxPMTextToLabel(rsLabel);
+
+    ::WinSetWindowText(GetHwnd(), sLabel.c_str());
+} // end of wxControl::SetLabel
+

 // ---------------------------------------------------------------------------
 // global functions
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 // global functions
 // ---------------------------------------------------------------------------