X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c9cb56f7f2fb75bce8722f81337253f5649325b9..51dc95a4c8ccb00741be48f6353749ada3e9f39a:/src/os2/control.cpp

diff --git a/src/os2/control.cpp b/src/os2/control.cpp
index f50e813f90..592ea3f48e 100644
--- a/src/os2/control.cpp
+++ b/src/os2/control.cpp
@@ -74,6 +74,38 @@ wxControl::~wxControl()
     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
@@ -99,6 +131,11 @@ bool wxControl::OS2CreateControl(
 
         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