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 aa7950a3e13d339dbdd578d6e0e97caa627c267c..0cbb947156cf542dafbbacb65899ee21851edb3a 100644 (file)
--- a/include/wx/radiobox.h
+++ b/include/wx/radiobox.h
@@ -5,93 +5,76 @@
 // Modified by:
 // Created:     10.09.00
 // RCS-ID:      $Id$
-// Copyright:   (c) wxWindows team
-// Licence:     wxWindows license
+// Copyright:   (c) Vadim Zeitlin
+// Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_RADIOBOX_H_BASE_
 #define _WX_RADIOBOX_H_BASE_
 
-#ifdef __GNUG__
-    #pragma interface "radioboxbase.h"
-#endif
-
 #if wxUSE_RADIOBOX
 
-#include "wx/control.h"
+#include "wx/ctrlsub.h"
 
-WXDLLEXPORT_DATA(extern const wxChar*) wxRadioBoxNameStr;
+extern WXDLLEXPORT_DATA(const wxChar) wxRadioBoxNameStr[];
 
 // ----------------------------------------------------------------------------
 // wxRadioBoxBase is not a normal base class, but rather a mix-in because the
 // real wxRadioBox derives from different classes on different platforms: for
-// example, it is a wxStaticBox in wxUniv but not in wxMSW
+// example, it is a wxStaticBox in wxUniv and wxMSW but not in other ports
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxRadioBoxBase
+class WXDLLEXPORT wxRadioBoxBase : public wxItemContainerImmutable
 {
 public:
-    // selection
-    virtual void SetSelection(int n) = 0;
-    virtual int GetSelection() const = 0;
+    // 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 wxString GetStringSelection() const
-    {
-        wxString s;
-        int sel = GetSelection();
-        if ( sel != wxNOT_FOUND )
-            s = GetString(sel);
+    // 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 s;
-    }
+    // return number of columns/rows in this radiobox
+    int GetColumnCount() const { return m_numCols; }
+    int GetRowCount() const { return m_numRows; }
 
-    virtual bool SetStringSelection(const wxString& s)
-    {
-        int sel = FindString(s);
-        if ( sel != wxNOT_FOUND )
-        {
-            SetSelection(sel);
+    // return the item above/below/to the left/right of the given one
+    int GetNextItem(int item, wxDirection dir, long style) const;
 
-            return TRUE;
-        }
 
-        return FALSE;
-    }
+    // deprecated functions
+    // --------------------
+
+#if WXWIN_COMPATIBILITY_2_4
+    wxDEPRECATED( int GetNumberOfRowsOrCols() const );
+    wxDEPRECATED( void SetNumberOfRowsOrCols(int n) );
+#endif // WXWIN_COMPATIBILITY_2_4
 
-    // string access
-    virtual int GetCount() const = 0;
-    virtual int FindString(const wxString& s) const
+protected:
+    wxRadioBoxBase()
     {
-        int count = GetCount();
-        for ( int n = 0; n < count; n++ )
-        {
-            if ( GetString(n) == s )
-                return n;
-        }
-
-        return wxNOT_FOUND;
+        m_majorDim = 0;
     }
 
-    virtual wxString GetString(int n) const = 0;
-    virtual void SetString(int n, const wxString& label) = 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; }
 
-    // change the individual radio button state
-    virtual void Enable(int n, bool enable = TRUE) = 0;
-    virtual void Show(int n, bool show = TRUE) = 0;
+    // 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);
 
-    // layout parameters
-    virtual int GetColumnCount() const = 0;
-    virtual int GetRowCount() const = 0;
 
-    // return the item above/below/to the left/right of the given one
-    int GetNextItem(int item, wxDirection dir, long style) const;
-
-    // for compatibility only, don't use these methods in new code!
-#ifdef WXWIN_COMPATIBILITY_2
-    int Number() const { return GetCount(); }
-    wxString GetLabel(int n) const { return GetString(n); }
-    void SetLabel(int n, const wxString& label) { SetString(n, label); }
-#endif // WXWIN_COMPATIBILITY_2
+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__)
@@ -100,16 +83,18 @@ public:
     #include "wx/msw/radiobox.h"
 #elif defined(__WXMOTIF__)
     #include "wx/motif/radiobox.h"
-#elif defined(__WXGTK__)
+#elif defined(__WXGTK20__)
     #include "wx/gtk/radiobox.h"
-#elif defined(__WXQT__)
-    #include "wx/qt/radiobox.h"
+#elif defined(__WXGTK__)
+    #include "wx/gtk1/radiobox.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/radiobox.h"
+#elif defined(__WXCOCOA__)
+    #include "wx/cocoa/radiobox.h"
 #elif defined(__WXPM__)
     #include "wx/os2/radiobox.h"
-#elif defined(__WXSTUBS__)
-    #include "wx/stubs/radiobox.h"
+#elif defined(__WXPALMOS__)
+    #include "wx/palmos/radiobox.h"
 #endif
 
 #endif // wxUSE_RADIOBOX