From: Vadim Zeitlin Date: Fri, 10 Jan 2003 23:27:17 +0000 (+0000) Subject: removed style parameter from MSWCreate(), it is unneeded X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/6dd16e4f26490f1f4f2be1204840cbf4ecf74a35?hp=29020b904885483adb428cbaf7aa30077f7c0cf2 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 --- diff --git a/include/wx/msw/control.h b/include/wx/msw/control.h index e5e7f5c918..c95d25f1b6 100644 --- a/include/wx/msw/control.h +++ b/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, - long style); + const wxSize& size); // NB: the method below is deprecated now, with MSWGetStyle() the method // above should be used instead! Once all the controls are updated to diff --git a/src/msw/control.cpp b/src/msw/control.cpp index ba76513c75..3a3b57b99c 100644 --- a/src/msw/control.cpp +++ b/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, - long style) + const wxSize& size) { WXDWORD exstyle; - WXDWORD msStyle = MSWGetStyle(style, &exstyle); + WXDWORD msStyle = MSWGetStyle(GetWindowStyle(), &exstyle); return MSWCreateControl(classname, msStyle, pos, size, label, exstyle); } diff --git a/src/msw/notebook.cpp b/src/msw/notebook.cpp index f2920163e9..cec5d7ff52 100644 --- a/src/msw/notebook.cpp +++ b/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, - style | wxTAB_TRAVERSAL) ) + if ( !MSWCreateControl(WC_TABCONTROL, _T(""), pos, size) ) return FALSE; SetBackgroundColour(wxColour(::GetSysColor(COLOR_BTNFACE))); diff --git a/src/msw/statbmp.cpp b/src/msw/statbmp.cpp index 7adde1d63e..52dc1c5bbc 100644 --- a/src/msw/statbmp.cpp +++ b/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; diff --git a/src/msw/statline.cpp b/src/msw/statline.cpp index 088e4e2d39..29ee6373e1 100644 --- a/src/msw/statline.cpp +++ b/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 diff --git a/src/msw/stattext.cpp b/src/msw/stattext.cpp index 1c0810694c..6a2056e2af 100644 --- a/src/msw/stattext.cpp +++ b/src/msw/stattext.cpp @@ -34,60 +34,39 @@ IMPLEMENT_DYNAMIC_CLASS(wxStaticText, wxControl) -bool wxStaticText::Create(wxWindow *parent, wxWindowID id, - const wxString& label, - const wxPoint& pos, - const wxSize& size, - long style, - const wxString& name) +bool wxStaticText::Create(wxWindow *parent, + wxWindowID id, + const wxString& label, + const wxPoint& pos, + const wxSize& size, + long style, + const wxString& name) { - SetName(name); - if (parent) parent->AddChild(this); + if ( !CreateControl(parent, id, pos, size, style, wxDefaultValidator, name) ) + return FALSE; - SetBackgroundColour(parent->GetBackgroundColour()) ; - SetForegroundColour(parent->GetForegroundColour()) ; + if ( !MSWCreateControl(wxT("STATIC"), label, pos, size) ) + return FALSE; - if ( id == -1 ) - m_windowId = (int)NewControlId(); - else - m_windowId = id; - - int x = pos.x; - int y = pos.y; - int width = size.x; - int height = size.y; - - m_windowStyle = style; - - long msStyle = WS_CHILD | WS_VISIBLE; - - 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; +} - return TRUE; +WXDWORD wxStaticText::MSWGetStyle(long style, WXDWORD *exstyle) const +{ + WXDWORD msStyle = wxControl::MSWGetStyle(style, exstyle); + + // 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; + + return msStyle; } wxSize wxStaticText::DoGetBestSize() const