first pass of wxUniv merge - nothing works, most parts don't even compile
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10673 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -15,27 +15,8 @@
|
||||
#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"
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// classes
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
class wxRadioBox;
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// global data
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
extern const char *wxRadioBoxNameStr;
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// wxRadioBox
|
||||
//-----------------------------------------------------------------------------
|
||||
@@ -97,7 +78,8 @@ public:
|
||||
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 );
|
||||
|
||||
@@ -131,6 +113,4 @@ private:
|
||||
DECLARE_DYNAMIC_CLASS(wxRadioBox)
|
||||
};
|
||||
|
||||
#endif
|
||||
|
||||
#endif // __GTKRADIOBOXH__
|
||||
|
Reference in New Issue
Block a user