DJGPP compilation

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

diff --git a/src/os2/control.cpp b/src/os2/control.cpp
index f50e813f90a2caf87463bae07318944c5e526395..0d6acde2267892b1828d1511de4e26f0a0270fa2 100644 (file)
--- a/src/os2/control.cpp
+++ b/src/os2/control.cpp
@@ -33,8 +33,6 @@ END_EVENT_TABLE()
 // Item members
 wxControl::wxControl()
 {
 // Item members
 wxControl::wxControl()
 {

-  m_backgroundColour = *wxWHITE;
-  m_foregroundColour = *wxBLACK;

 
 #if WXWIN_COMPATIBILITY
   m_callback = 0;
 
 #if WXWIN_COMPATIBILITY
   m_callback = 0;


@@ -74,6 +72,38 @@ wxControl::~wxControl()
     m_isBeingDeleted = TRUE;
 }
 
     m_isBeingDeleted = TRUE;
 }
 

+bool wxControl::OS2CreateControl(
+  wxWindow*                         pParent
+, wxWindowID                        vId
+, const wxPoint&                    rPos
+, const wxSize&                     rSize
+, long                              lStyle
+#if wxUSE_VALIDATORS
+, const wxValidator&                rValidator
+#endif
+, const wxString&                   rsName
+)
+{
+    //
+    // Even if it's possible to create controls without parents in some port,
+    // it should surely be discouraged because it doesn't work at all under
+    // Windows
+    //
+    if (!CreateBase( pParent
+                    ,vId
+                    ,rPos
+                    ,rSize
+                    ,lStyle
+#if wxUSE_VALIDATORS
+                    ,rValidator
+#endif
+                    ,rsName
+                   ))
+        return FALSE;
+    pParent->AddChild(this);
+    return TRUE;
+} // end of wxControl::OS2CreateControl
+

 bool wxControl::OS2CreateControl(
   const wxChar*                     zClassname
 , WXDWORD                           dwStyle
 bool wxControl::OS2CreateControl(
   const wxChar*                     zClassname
 , WXDWORD                           dwStyle


@@ -99,6 +129,11 @@ bool wxControl::OS2CreateControl(
 
         return FALSE;
     }
 
         return FALSE;
     }

+
+    PSZ                             zClass;
+
+    if ((strcmp(zClassname, "COMBOBOX")) == 0)
+        zClass = WC_COMBOBOX;

     dwStyle |= WS_VISIBLE;
     m_hWnd = (WXHWND)::WinCreateWindow( (HWND)GetHwndOf(GetParent()) // Parent window handle
                                        ,(PSZ)zClassname              // Window class
     dwStyle |= WS_VISIBLE;
     m_hWnd = (WXHWND)::WinCreateWindow( (HWND)GetHwndOf(GetParent()) // Parent window handle
                                        ,(PSZ)zClassname              // Window class