No real changes, just cleanup week days handling in wxGenericCalendarCtrl.

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

diff --git a/include/wx/motif/radiobox.h b/include/wx/motif/radiobox.h
index a37b8f662845151170cdba3a8ef0005c4c42f98f..9b131fcb77386b71ec7560603a048a18baee02ae 100644 (file)
--- a/include/wx/motif/radiobox.h
+++ b/include/wx/motif/radiobox.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        radiobox.h
+// Name:        wx/motif/radiobox.h

 // Purpose:     wxRadioBox class
 // Author:      Julian Smart
 // Modified by:
 // Purpose:     wxRadioBox class
 // Author:      Julian Smart
 // Modified by:


@@ -12,10 +12,6 @@
 #ifndef _WX_MOTIF_RADIOBOX_H_
 #define _WX_MOTIF_RADIOBOX_H_
 
 #ifndef _WX_MOTIF_RADIOBOX_H_
 #define _WX_MOTIF_RADIOBOX_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "radiobox.h"
-#endif
-

 #ifndef wxWIDGET_ARRAY_DEFINED
     #define wxWIDGET_ARRAY_DEFINED
 
 #ifndef wxWIDGET_ARRAY_DEFINED
     #define wxWIDGET_ARRAY_DEFINED
 


@@ -25,7 +21,7 @@
 
 #include "wx/arrstr.h"
 
 
 #include "wx/arrstr.h"
 

-class WXDLLEXPORT wxRadioBox : public wxControl, public wxRadioBoxBase
+class WXDLLIMPEXP_CORE wxRadioBox : public wxControl, public wxRadioBoxBase

 {
 public:
     wxRadioBox() { Init(); }
 {
 public:
     wxRadioBox() { Init(); }


@@ -34,7 +30,7 @@ public:
                const wxPoint& pos = wxDefaultPosition,
                const wxSize& size = wxDefaultSize,
                int n = 0, const wxString choices[] = NULL,
                const wxPoint& pos = wxDefaultPosition,
                const wxSize& size = wxDefaultSize,
                int n = 0, const wxString choices[] = NULL,

-               int majorDim = 0, long style = wxRA_HORIZONTAL,
+               int majorDim = 0, long style = wxRA_SPECIFY_COLS,

                const wxValidator& val = wxDefaultValidator,
                const wxString& name = wxRadioBoxNameStr)
     {
                const wxValidator& val = wxDefaultValidator,
                const wxString& name = wxRadioBoxNameStr)
     {


@@ -48,7 +44,7 @@ public:
                const wxPoint& pos,
                const wxSize& size,
                const wxArrayString& choices,
                const wxPoint& pos,
                const wxSize& size,
                const wxArrayString& choices,

-               int majorDim = 0, long style = wxRA_HORIZONTAL,
+               int majorDim = 0, long style = wxRA_SPECIFY_COLS,

                const wxValidator& val = wxDefaultValidator,
                const wxString& name = wxRadioBoxNameStr)
     {
                const wxValidator& val = wxDefaultValidator,
                const wxString& name = wxRadioBoxNameStr)
     {


@@ -58,13 +54,13 @@ public:
                majorDim, style, val, name);
     }
 
                majorDim, style, val, name);
     }
 

-    ~wxRadioBox();
+    virtual ~wxRadioBox();

 
     bool Create(wxWindow *parent, wxWindowID id, const wxString& title,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 int n = 0, const wxString choices[] = NULL,
 
     bool Create(wxWindow *parent, wxWindowID id, const wxString& title,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 int n = 0, const wxString choices[] = NULL,

-                int majorDim = 0, long style = wxRA_HORIZONTAL,
+                int majorDim = 0, long style = wxRA_SPECIFY_COLS,

                 const wxValidator& val = wxDefaultValidator,
                 const wxString& name = wxRadioBoxNameStr);
 
                 const wxValidator& val = wxDefaultValidator,
                 const wxString& name = wxRadioBoxNameStr);
 


@@ -72,29 +68,39 @@ public:
                 const wxPoint& pos,
                 const wxSize& size,
                 const wxArrayString& choices,
                 const wxPoint& pos,
                 const wxSize& size,
                 const wxArrayString& choices,

-                int majorDim = 0, long style = wxRA_HORIZONTAL,
+                int majorDim = 0, long style = wxRA_SPECIFY_COLS,

                 const wxValidator& val = wxDefaultValidator,
                 const wxString& name = wxRadioBoxNameStr);
 
                 const wxValidator& val = wxDefaultValidator,
                 const wxString& name = wxRadioBoxNameStr);
 

-    int FindString(const wxString& s) const;
-    void SetSelection(int N);
+    // Enabling
+    virtual bool Enable(bool enable = true);
+    virtual bool Enable(unsigned int item, bool enable = true);
+    virtual bool IsItemEnabled(unsigned int WXUNUSED(n)) const
+    {
+        /* TODO */
+        return true;
+    }
+
+    // Showing
+    virtual bool Show(bool show = true);
+    virtual bool Show(unsigned int item, bool show = true);
+    virtual bool IsItemShown(unsigned int WXUNUSED(n)) const
+    {
+        /* TODO */
+        return true;
+    }
+
+    virtual void SetSelection(int n);

     int GetSelection() const;
 
     int GetSelection() const;
 

-    void SetString(int item, const wxString& label) ;
-    wxString GetString(int item) const;
-    virtual bool Enable(bool enable = true);
-    virtual bool Enable(int item, bool enable = true);
-    void Show(int item, bool show) ;
-    virtual bool Show(bool show = true) ;
+    virtual void SetString(unsigned int item, const wxString& label);
+    virtual wxString GetString(unsigned int item) const;

 
     virtual wxString GetStringSelection() const;
     virtual bool SetStringSelection(const wxString& s);
 
     virtual wxString GetStringSelection() const;
     virtual bool SetStringSelection(const wxString& s);

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

     void Command(wxCommandEvent& event);
 
     void Command(wxCommandEvent& event);
 

-    int GetColumnCount() const;
-    int GetRowCount() const;
-

     int GetNumberOfRowsOrCols() const { return m_noRowsOrCols; }
     void SetNumberOfRowsOrCols(int n) { m_noRowsOrCols = n; }
 
     int GetNumberOfRowsOrCols() const { return m_noRowsOrCols; }
     void SetNumberOfRowsOrCols(int n) { m_noRowsOrCols = n; }
 


@@ -107,12 +113,12 @@ public:
     virtual WXWidget GetLabelWidget() const { return m_labelWidget; }
 
 protected:
     virtual WXWidget GetLabelWidget() const { return m_labelWidget; }
 
 protected:

+    virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }

     virtual void DoSetSize(int x, int y,
                            int width, int height,
                            int sizeFlags = wxSIZE_AUTO);
 
     virtual void DoSetSize(int x, int y,
                            int width, int height,
                            int sizeFlags = wxSIZE_AUTO);
 

-    int               m_majorDim;
-    int               m_noItems;
+    unsigned int      m_noItems;

     int               m_noRowsOrCols;
     int               m_selectedButton;
 
     int               m_noRowsOrCols;
     int               m_selectedButton;
 


@@ -127,4 +133,3 @@ private:
 };
 
 #endif // _WX_MOTIF_RADIOBOX_H_
 };
 
 #endif // _WX_MOTIF_RADIOBOX_H_

-