reverted patch 598016 (removed MSWCreateControl() visible parameter)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16678 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/msw/control.h b/include/wx/msw/control.h
index 3dde9eef15fc3ccd3f1f49484c317d5e142fb185..e5e7f5c918ca0f6a7509761136c24775f12ca816 100644 (file)
--- a/include/wx/msw/control.h
+++ b/include/wx/msw/control.h
@@ -92,15 +92,12 @@ protected:
 
     virtual wxSize DoGetBestSize() const;
 
-
     // create the control of the given Window class
     bool MSWCreateControl(const wxChar *classname,
                           const wxString& label,
                           const wxPoint& pos,
                           const wxSize& size,
-                          long style,
-                          bool visible = true);
-
+                          long style);
 
     // NB: the method below is deprecated now, with MSWGetStyle() the method
     //     above should be used instead! Once all the controls are updated to
@@ -120,8 +117,7 @@ protected:
                           const wxPoint& pos = wxDefaultPosition,
                           const wxSize& size = wxDefaultSize,
                           const wxString& label = wxEmptyString,
-                          WXDWORD exstyle = (WXDWORD)-1,
-                          bool visible = true);
+                          WXDWORD exstyle = (WXDWORD)-1);
 
     // default style for the control include WS_TABSTOP if it AcceptsFocus()
     virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;

diff --git a/src/msw/combobox.cpp b/src/msw/combobox.cpp
index 7b65a4701d6aa952fd1b199d01e869758e19f470..ceb2d59b8e8b51cc9220a852490674cfc8d4b6f3 100644 (file)
--- a/src/msw/combobox.cpp
+++ b/src/msw/combobox.cpp
@@ -326,7 +326,7 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
 
 
     // and now create the MSW control
-    if ( !MSWCreateControl(_T("COMBOBOX"), msStyle, pos, size, wxEmptyString, (WXDWORD)-1, false) )
+    if ( !MSWCreateControl(_T("COMBOBOX"), msStyle) )
         return FALSE;
 
     // A choice/combobox normally has a white background (or other, depending
@@ -360,9 +360,6 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
                                       );
     }
 
-    // finally, show the combo box
-    Show(true);
-
     return TRUE;
 }
 

diff --git a/src/msw/control.cpp b/src/msw/control.cpp
index 1beeb2b8d266e7305f3b3d375b8e06c342280bc0..930d7542ce8ff106fbfb3ad4a5afffed908ee7f7 100644 (file)
--- a/src/msw/control.cpp
+++ b/src/msw/control.cpp
@@ -79,13 +79,12 @@ bool wxControl::MSWCreateControl(const wxChar *classname,
                                  const wxString& label,
                                  const wxPoint& pos,
                                  const wxSize& size,
-                                 long style,
-                                 bool visible)
+                                 long style)
 {
     WXDWORD exstyle;
     WXDWORD msStyle = MSWGetStyle(style, &exstyle);
 
-    return MSWCreateControl(classname, msStyle, pos, size, label, exstyle, visible);
+    return MSWCreateControl(classname, msStyle, pos, size, label, exstyle);
 }
 
 bool wxControl::MSWCreateControl(const wxChar *classname,
@@ -93,8 +92,7 @@ bool wxControl::MSWCreateControl(const wxChar *classname,
                                  const wxPoint& pos,
                                  const wxSize& size,
                                  const wxString& label,
-                                 WXDWORD exstyle,
-                                 bool visible)
+                                 WXDWORD exstyle)
 {
     // want3D tells us whether or not the style specified a 3D border.
     // If so, under WIN16 we can use Ctl3D to give it an appropriate style.
@@ -110,18 +108,7 @@ bool wxControl::MSWCreateControl(const wxChar *classname,
 
     // all controls should have these styles (wxWindows creates all controls
     // visible by default)
-    style |= WS_CHILD;
-    
-    // sometimes, controls will defer showing the window until
-    // all configuration, sizing, and positioning is completed
-    if (!visible)
-    {
-        m_isShown = FALSE;
-    }
-     else
-    {
-        style |= WS_VISIBLE;
-    }
+    style |= WS_CHILD | WS_VISIBLE;
 
     int x = pos.x == -1 ? 0 : pos.x,
         y = pos.y == -1 ? 0 : pos.y,