fixed off by one error in wxXPMDecoder::ReadFile

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

diff --git a/include/wx/os2/radiobox.h b/include/wx/os2/radiobox.h
index ec2ac64f86244f8543d1197099dede317f735258..e664ccf7bf4da0a5d971170534fe70181d771809 100644 (file)
--- a/include/wx/os2/radiobox.h
+++ b/include/wx/os2/radiobox.h
@@ -12,14 +12,12 @@
 #ifndef _WX_RADIOBOX_H_
 #define _WX_RADIOBOX_H_
 
 #ifndef _WX_RADIOBOX_H_
 #define _WX_RADIOBOX_H_
 

-#include "wx/control.h"
-

 WXDLLEXPORT_DATA(extern const char*) wxRadioBoxNameStr;
 
 // List box item
 class WXDLLEXPORT wxBitmap ;
 
 WXDLLEXPORT_DATA(extern const char*) wxRadioBoxNameStr;
 
 // List box item
 class WXDLLEXPORT wxBitmap ;
 

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

 {
   DECLARE_DYNAMIC_CLASS(wxRadioBox)
 public:
 {
   DECLARE_DYNAMIC_CLASS(wxRadioBox)
 public:


@@ -30,11 +28,7 @@ public:
              int n = 0, const wxString choices[] = NULL,
              int majorDim = 0, long style = wxRA_HORIZONTAL,
 #if wxUSE_VALIDATORS
              int n = 0, const wxString choices[] = NULL,
              int majorDim = 0, long style = wxRA_HORIZONTAL,
 #if wxUSE_VALIDATORS

-#  if defined(__VISAGECPP__)
-             const wxValidator* val = wxDefaultValidator, const wxString& name = wxRadioBoxNameStr)
-#  else

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

-#  endif

 #endif
   {
     Create(parent, id, title, pos, size, n, choices, majorDim, style, val, name);
 #endif
   {
     Create(parent, id, title, pos, size, n, choices, majorDim, style, val, name);


@@ -47,11 +41,7 @@ public:
              int n = 0, const wxString choices[] = NULL,
              int majorDim = 0, long style = wxRA_HORIZONTAL,
 #if wxUSE_VALIDATORS
              int n = 0, const wxString choices[] = NULL,
              int majorDim = 0, long style = wxRA_HORIZONTAL,
 #if wxUSE_VALIDATORS

-#  if defined(__VISAGECPP__)
-             const wxValidator* val = wxDefaultValidator, const wxString& name = wxRadioBoxNameStr);
-#  else

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

-#  endif

 #endif
 
   virtual bool OS2Command(WXUINT param, WXWORD id);
 #endif
 
   virtual bool OS2Command(WXUINT param, WXWORD id);


@@ -61,7 +51,11 @@ public:
   int FindString(const wxString& s) const;
   void SetSelection(int N);
   int GetSelection() const;
   int FindString(const wxString& s) const;
   void SetSelection(int N);
   int GetSelection() const;

+  virtual int GetCount() const;

   wxString GetString(int N) const;
   wxString GetString(int N) const;

+  virtual void SetString(int n, const wxString& label);
+  virtual int GetColumnCount() const;
+  virtual int GetRowCount() const;

 
   void GetSize(int *x, int *y) const;
   void GetPosition(int *x, int *y) const;
 
   void GetSize(int *x, int *y) const;
   void GetPosition(int *x, int *y) const;