Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

removed the weird m_style which was never initialized GTK and duplicated m_windowStyle under Mac/MSW

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24179 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2003-10-15 22:45:23 +00:00
parent de0bc93298
commit f4992e37c0
4 changed files with 2 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
include/wx/checkbox.h
View File

@@ -99,19 +99,14 @@ public:
DoSet3StateValue(state); DoSet3StateValue(state);
} }
bool Is3State() const bool Is3State() const { return HasFlag(wxCHK_3STATE); }
{
return (m_style & wxCHK_3STATE) != 0;
}
bool Is3rdStateAllowedForUser() const bool Is3rdStateAllowedForUser() const
{ {
return (m_style & wxCHK_ALLOW_3RD_STATE_FOR_USER) != 0; return HasFlag(wxCHK_ALLOW_3RD_STATE_FOR_USER);
} }
protected: protected:
int m_style;
virtual void DoSet3StateValue(wxCheckBoxState WXUNUSED(state)) { wxFAIL; } virtual void DoSet3StateValue(wxCheckBoxState WXUNUSED(state)) { wxFAIL; }
virtual wxCheckBoxState DoGet3StateValue() const virtual wxCheckBoxState DoGet3StateValue() const

2
src/mac/carbon/checkbox.cpp
View File

@@ -34,8 +34,6 @@ bool wxCheckBox::Create(wxWindow *parent, wxWindowID id, const wxString& label,
if ( !wxCheckBoxBase::Create(parent, id, pos, size, style, validator, name) ) if ( !wxCheckBoxBase::Create(parent, id, pos, size, style, validator, name) )
return false; return false;
m_style = style;
Rect bounds ; Rect bounds ;
Str255 title ; Str255 title ;

2
src/mac/checkbox.cpp
View File

@@ -34,8 +34,6 @@ bool wxCheckBox::Create(wxWindow *parent, wxWindowID id, const wxString& label,
if ( !wxCheckBoxBase::Create(parent, id, pos, size, style, validator, name) ) if ( !wxCheckBoxBase::Create(parent, id, pos, size, style, validator, name) )
return false; return false;
m_style = style;
Rect bounds ; Rect bounds ;
Str255 title ; Str255 title ;

2
src/msw/checkbox.cpp
View File

@@ -143,8 +143,6 @@ bool wxCheckBox::Create(wxWindow *parent,
if ( !CreateControl(parent, id, pos, size, style, validator, name) ) if ( !CreateControl(parent, id, pos, size, style, validator, name) )
return FALSE; return FALSE;
m_style = style;
long msStyle = WS_TABSTOP; long msStyle = WS_TABSTOP;
if ( style & wxCHK_3STATE ) if ( style & wxCHK_3STATE )