removed the weird m_style which was never initialized GTK and duplicated m_windowStyl...

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

diff --git a/include/wx/checkbox.h b/include/wx/checkbox.h
index 47a4e356d503f5da57a9c7d4d7bed5ed7cefe0a4..6b30a0a25fa57aa88190f39501fd8fc7f7b880b0 100644 (file)
--- a/include/wx/checkbox.h
+++ b/include/wx/checkbox.h
@@ -99,19 +99,14 @@ public:
         DoSet3StateValue(state);
     }
 
         DoSet3StateValue(state);
     }
 

-    bool Is3State() const
-    {
-        return (m_style & wxCHK_3STATE) != 0;
-    }
+    bool Is3State() const { return HasFlag(wxCHK_3STATE); }

 
     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 wxCheckBoxState DoGet3StateValue() const
     virtual void DoSet3StateValue(wxCheckBoxState WXUNUSED(state)) { wxFAIL; }
 
     virtual wxCheckBoxState DoGet3StateValue() const

diff --git a/src/mac/carbon/checkbox.cpp b/src/mac/carbon/checkbox.cpp
index dbf5b7d4e2b13ec58991ac67972879b43d2e0d57..6e6aa299b2cd2470ba715ac7f41ace0f540ebf3e 100644 (file)
--- a/src/mac/carbon/checkbox.cpp
+++ b/src/mac/carbon/checkbox.cpp
@@ -34,8 +34,6 @@ bool wxCheckBox::Create(wxWindow *parent, wxWindowID id, const wxString& label,
     if ( !wxCheckBoxBase::Create(parent, id, pos, size, style, validator, name) )
         return false;
 
     if ( !wxCheckBoxBase::Create(parent, id, pos, size, style, validator, name) )
         return false;
 

-    m_style = style;
-

     Rect bounds ;
     Str255 title ;
     
     Rect bounds ;
     Str255 title ;
     

diff --git a/src/mac/checkbox.cpp b/src/mac/checkbox.cpp
index dbf5b7d4e2b13ec58991ac67972879b43d2e0d57..6e6aa299b2cd2470ba715ac7f41ace0f540ebf3e 100644 (file)
--- a/src/mac/checkbox.cpp
+++ b/src/mac/checkbox.cpp
@@ -34,8 +34,6 @@ bool wxCheckBox::Create(wxWindow *parent, wxWindowID id, const wxString& label,
     if ( !wxCheckBoxBase::Create(parent, id, pos, size, style, validator, name) )
         return false;
 
     if ( !wxCheckBoxBase::Create(parent, id, pos, size, style, validator, name) )
         return false;
 

-    m_style = style;
-

     Rect bounds ;
     Str255 title ;
     
     Rect bounds ;
     Str255 title ;
     

diff --git a/src/msw/checkbox.cpp b/src/msw/checkbox.cpp
index e8c6ec263ed0b91d63cc8c81812ab19a083e2e4f..494819949d801d1b08ba06b299b0cd1d727f060c 100644 (file)
--- a/src/msw/checkbox.cpp
+++ b/src/msw/checkbox.cpp
@@ -143,8 +143,6 @@ bool wxCheckBox::Create(wxWindow *parent,
     if ( !CreateControl(parent, id, pos, size, style, validator, name) )
         return FALSE;
 
     if ( !CreateControl(parent, id, pos, size, style, validator, name) )
         return FALSE;
 

-    m_style = style;
-

     long msStyle = WS_TABSTOP;
 
     if ( style & wxCHK_3STATE )
     long msStyle = WS_TABSTOP;
 
     if ( style & wxCHK_3STATE )