PyCrust updates

[wxWidgets.git] / include / wx / gtk / radiobox.h

diff --git a/include/wx/gtk/radiobox.h b/include/wx/gtk/radiobox.h
index d7805a70ca6c11a4aad7966add962e84c19382e1..6ecfc59a1755248426bd9c6b0909ec634423daea 100644 (file)
--- a/include/wx/gtk/radiobox.h
+++ b/include/wx/gtk/radiobox.h
@@ -15,27 +15,8 @@
 #pragma interface
 #endif
 
 #pragma interface
 #endif
 

-#include "wx/defs.h"
-
-#if wxUSE_RADIOBOX
-
-#include "wx/object.h"
-#include "wx/list.h"
-#include "wx/control.h"

 #include "wx/bitmap.h"
 
 #include "wx/bitmap.h"
 

-//-----------------------------------------------------------------------------
-// classes
-//-----------------------------------------------------------------------------
-
-class wxRadioBox;
-
-//-----------------------------------------------------------------------------
-// global data
-//-----------------------------------------------------------------------------
-
-extern const char *wxRadioBoxNameStr;
-

 //-----------------------------------------------------------------------------
 // wxRadioBox
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // wxRadioBox
 //-----------------------------------------------------------------------------


@@ -97,7 +78,8 @@ public:
     virtual wxString GetStringSelection() const;
     virtual bool SetStringSelection( const wxString& s );
     
     virtual wxString GetStringSelection() const;
     virtual bool SetStringSelection( const wxString& s );
     

-    virtual int Number() const;
+    int Number() const;
+    int GetCount() const { return Number(); }

     int GetNumberOfRowsOrCols() const;
     void SetNumberOfRowsOrCols( int n );
     
     int GetNumberOfRowsOrCols() const;
     void SetNumberOfRowsOrCols( int n );
     


@@ -117,7 +99,6 @@ public:
     virtual void DoSetSize( int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO );
     virtual void OnInternalIdle();
     
     virtual void DoSetSize( int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO );
     virtual void OnInternalIdle();
     

-    bool             m_alreadySent;

     bool             m_hasFocus,
                      m_lostFocus;
     int              m_majorDim;
     bool             m_hasFocus,
                      m_lostFocus;
     int              m_majorDim;


@@ -131,6 +112,4 @@ private:
     DECLARE_DYNAMIC_CLASS(wxRadioBox)
 };
 
     DECLARE_DYNAMIC_CLASS(wxRadioBox)
 };
 

-#endif
-

 #endif // __GTKRADIOBOXH__
 #endif // __GTKRADIOBOXH__