Fixes for WinCE build caused by my last commit.

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

diff --git a/include/wx/radiobox.h b/include/wx/radiobox.h
index c611759c36bc9a9046eb81551b84dbe11d43b421..0cbb947156cf542dafbbacb65899ee21851edb3a 100644 (file)
--- a/include/wx/radiobox.h
+++ b/include/wx/radiobox.h
@@ -16,7 +16,7 @@
 
 #include "wx/ctrlsub.h"
 
 
 #include "wx/ctrlsub.h"
 

-extern WXDLLEXPORT_DATA(const wxChar*) wxRadioBoxNameStr;
+extern WXDLLEXPORT_DATA(const wxChar) wxRadioBoxNameStr[];

 
 // ----------------------------------------------------------------------------
 // wxRadioBoxBase is not a normal base class, but rather a mix-in because the
 
 // ----------------------------------------------------------------------------
 // wxRadioBoxBase is not a normal base class, but rather a mix-in because the


@@ -27,21 +27,23 @@ extern WXDLLEXPORT_DATA(const wxChar*) wxRadioBoxNameStr;
 class WXDLLEXPORT wxRadioBoxBase : public wxItemContainerImmutable
 {
 public:
 class WXDLLEXPORT wxRadioBoxBase : public wxItemContainerImmutable
 {
 public:

-    // change the individual radio button state
+    // change/query the individual radio button state

     virtual bool Enable(int n, bool enable = true) = 0;
     virtual bool Show(int n, bool show = true) = 0;
 
     virtual bool Enable(int n, bool enable = true) = 0;
     virtual bool Show(int n, bool show = true) = 0;
 

-    // layout parameters
-    virtual int GetColumnCount() const = 0;
-    virtual int GetRowCount() const = 0;
+    // NB: these functions are stubbed here for now but should become pure
+    //     virtual once all ports implement them
+    virtual bool IsItemEnabled(int WXUNUSED(n)) const { return true; }
+    virtual bool IsItemShown(int WXUNUSED(n)) const { return true; }
+
+    // return number of columns/rows in this radiobox
+    int GetColumnCount() const { return m_numCols; }
+    int GetRowCount() const { return m_numRows; }

 
     // return the item above/below/to the left/right of the given one
     int GetNextItem(int item, wxDirection dir, long style) const;
 
 
 
     // return the item above/below/to the left/right of the given one
     int GetNextItem(int item, wxDirection dir, long style) const;
 
 

-    // implement some of wxItemContainerImmutable functions
-    virtual int FindString(const wxString& s) const;
-

     // deprecated functions
     // --------------------
 
     // deprecated functions
     // --------------------
 


@@ -50,12 +52,29 @@ public:
     wxDEPRECATED( void SetNumberOfRowsOrCols(int n) );
 #endif // WXWIN_COMPATIBILITY_2_4
 
     wxDEPRECATED( void SetNumberOfRowsOrCols(int n) );
 #endif // WXWIN_COMPATIBILITY_2_4
 

-    // for compatibility only, don't use these methods in new code!
-#if WXWIN_COMPATIBILITY_2_2
-    wxDEPRECATED( int Number() const );
-    wxDEPRECATED( wxString GetLabel(int n) const );
-    wxDEPRECATED( void SetLabel(int n, const wxString& label) );
-#endif // WXWIN_COMPATIBILITY_2_2
+protected:
+    wxRadioBoxBase()
+    {
+        m_majorDim = 0;
+    }
+
+    // return the number of items in major direction (which depends on whether
+    // we have wxRA_SPECIFY_COLS or wxRA_SPECIFY_ROWS style)
+    int GetMajorDim() const { return m_majorDim; }
+
+    // sets m_majorDim and also updates m_numCols/Rows
+    //
+    // the style parameter should be the style of the radiobox itself
+    void SetMajorDim(int majorDim, long style);
+
+
+private:
+    // the number of elements in major dimension (i.e. number of columns if
+    // wxRA_SPECIFY_COLS or the number of rows if wxRA_SPECIFY_ROWS) and also
+    // the number of rows/columns calculated from it
+    int m_majorDim,
+        m_numCols,
+        m_numRows;

 };
 
 #if defined(__WXUNIVERSAL__)
 };
 
 #if defined(__WXUNIVERSAL__)


@@ -64,8 +83,10 @@ public:
     #include "wx/msw/radiobox.h"
 #elif defined(__WXMOTIF__)
     #include "wx/motif/radiobox.h"
     #include "wx/msw/radiobox.h"
 #elif defined(__WXMOTIF__)
     #include "wx/motif/radiobox.h"

-#elif defined(__WXGTK__)
+#elif defined(__WXGTK20__)

     #include "wx/gtk/radiobox.h"
     #include "wx/gtk/radiobox.h"

+#elif defined(__WXGTK__)
+    #include "wx/gtk1/radiobox.h"

 #elif defined(__WXMAC__)
     #include "wx/mac/radiobox.h"
 #elif defined(__WXCOCOA__)
 #elif defined(__WXMAC__)
     #include "wx/mac/radiobox.h"
 #elif defined(__WXCOCOA__)