removed style parameter from MSWCreate(), it is unneeded

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

include/wx/msw/control.h

@@ -92,12 +92,15 @@ protected:
 
     virtual wxSize DoGetBestSize() const;
 
-    // create the control of the given Window class
+    // create the control of the given Windows class: this is typically called
+    // from Create() method of the derived class passing its label, pos and
+    // size parameter (style parameter is not needed because m_windowStyle is
+    // supposed to had been already set and so is used instead when this
+    // function is called)
     bool MSWCreateControl(const wxChar *classname,
                           const wxString& label,
                           const wxPoint& pos,
-                          const wxSize& size,
+                          const wxSize& size);
-                          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

src/msw/control.cpp

@@ -78,11 +78,10 @@ bool wxControl::Create(wxWindow *parent,
 bool wxControl::MSWCreateControl(const wxChar *classname,
                                  const wxString& label,
                                  const wxPoint& pos,
-                                 const wxSize& size,
+                                 const wxSize& size)
-                                 long style)
 {
     WXDWORD exstyle;
-    WXDWORD msStyle = MSWGetStyle(style, &exstyle);
+    WXDWORD msStyle = MSWGetStyle(GetWindowStyle(), &exstyle);
 
     return MSWCreateControl(classname, msStyle, pos, size, label, exstyle);
 }

src/msw/notebook.cpp

@@ -142,12 +142,11 @@ bool wxNotebook::Create(wxWindow *parent,
                         const wxString& name)
 {
     // base init
-    if ( !CreateControl(parent, id, pos, size, style, wxDefaultValidator, name) )
+    if ( !CreateControl(parent, id, pos, size, style | wxTAB_TRAVERSAL,
+                        wxDefaultValidator, name) )
         return FALSE;
 
-    // notebook, so explicitly specify 0 as last parameter
+    if ( !MSWCreateControl(WC_TABCONTROL, _T(""), pos, size) )
-    if ( !MSWCreateControl(WC_TABCONTROL, _T(""), pos, size,
-                style | wxTAB_TRAVERSAL) )
         return FALSE;
 
     SetBackgroundColour(wxColour(::GetSysColor(COLOR_BTNFACE)));

src/msw/statbmp.cpp

@@ -122,7 +122,7 @@ bool wxStaticBitmap::Create(wxWindow *parent,
 #else // Win16
                            _T("BUTTON"),
 #endif // Win32/16
-                           _T(""), pos, size, style) )
+                           _T(""), pos, size) )
     {
         // control creation failed
         return FALSE;

src/msw/statline.cpp

@@ -64,7 +64,7 @@ bool wxStaticLine::Create(wxWindow *parent,
     if ( !CreateControl(parent, id, pos, size, style, wxDefaultValidator, name) )
         return FALSE;
 
-    return MSWCreateControl(_T("STATIC"), _T(""), pos, size, style);
+    return MSWCreateControl(_T("STATIC"), _T(""), pos, size);
 }
 
 WXDWORD wxStaticLine::MSWGetStyle(long style, WXDWORD *exstyle) const

src/msw/stattext.cpp

@@ -34,60 +34,39 @@
 
 IMPLEMENT_DYNAMIC_CLASS(wxStaticText, wxControl)
 
-bool wxStaticText::Create(wxWindow *parent, wxWindowID id,
+bool wxStaticText::Create(wxWindow *parent,
-           const wxString& label,
+                          wxWindowID id,
-           const wxPoint& pos,
+                          const wxString& label,
-           const wxSize& size,
+                          const wxPoint& pos,
-           long style,
+                          const wxSize& size,
-           const wxString& name)
+                          long style,
+                          const wxString& name)
 {
-  SetName(name);
+    if ( !CreateControl(parent, id, pos, size, style, wxDefaultValidator, name) )
-  if (parent) parent->AddChild(this);
+        return FALSE;
 
-  SetBackgroundColour(parent->GetBackgroundColour()) ;
+    if ( !MSWCreateControl(wxT("STATIC"), label, pos, size) )
-  SetForegroundColour(parent->GetForegroundColour()) ;
+        return FALSE;
 
-  if ( id == -1 )
+    return TRUE;
-    m_windowId = (int)NewControlId();
+}
-  else
-  m_windowId = id;
 
-  int x = pos.x;
+WXDWORD wxStaticText::MSWGetStyle(long style, WXDWORD *exstyle) const
-  int y = pos.y;
+{
-  int width = size.x;
+    WXDWORD msStyle = wxControl::MSWGetStyle(style, exstyle);
-  int height = size.y;
 
-  m_windowStyle = style;
+    // translate the alignment flags to the Windows ones
+    //
+    // note that both wxALIGN_LEFT and SS_LEFT are equal to 0 so we shouldn't
+    // test for them using & operator
+    if ( style & wxALIGN_CENTRE )
+        msStyle |= SS_CENTER;
+    else if ( style & wxALIGN_RIGHT )
+        msStyle |= SS_RIGHT;
+    else
+        msStyle |= SS_LEFT;
 
-  long msStyle = WS_CHILD | WS_VISIBLE;
+    return msStyle;
-
-  if ( m_windowStyle & wxCLIP_SIBLINGS )
-    msStyle |= WS_CLIPSIBLINGS;
-  if (m_windowStyle & wxALIGN_CENTRE)
-    msStyle |= SS_CENTER;
-  else if (m_windowStyle & wxALIGN_RIGHT)
-    msStyle |= SS_RIGHT;
-  else
-    msStyle |= SS_LEFT;
-
-  // Even with extended styles, need to combine with WS_BORDER
-  // for them to look right.
-  if ( wxStyleHasBorder(m_windowStyle) )
-    msStyle |= WS_BORDER;
-
-  m_hWnd = (WXHWND)::CreateWindowEx(MakeExtendedStyle(m_windowStyle), wxT("STATIC"), (const wxChar *)label,
-                         msStyle,
-                         0, 0, 0, 0, (HWND) parent->GetHWND(), (HMENU)m_windowId,
-                         wxGetInstance(), NULL);
-
-  wxCHECK_MSG( m_hWnd, FALSE, wxT("Failed to create static ctrl") );
-
-  SubclassWin(m_hWnd);
-
-  wxControl::SetFont(parent->GetFont());
-  SetSize(x, y, width, height);
-
-  return TRUE;
 }
 
 wxSize wxStaticText::DoGetBestSize() const