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
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);
}
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)));
#else // Win16
_T("BUTTON"),
#endif // Win32/16
- _T(""), pos, size, style) )
+ _T(""), pos, size) )
{
// control creation failed
return FALSE;
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
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