gtkfeatures.h does not exist under gtk+ 1.3.1, #ifndef it out

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

diff --git a/include/wx/os2/radiobox.h b/include/wx/os2/radiobox.h
index f483123cc43529e1c4e8d702c4e7b428c0cfa980..9c424e88940cd001a8167d29911efc44593bb34c 100644 (file)
--- a/include/wx/os2/radiobox.h
+++ b/include/wx/os2/radiobox.h
@@ -29,7 +29,9 @@ public:
              const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
              int n = 0, const wxString choices[] = NULL,
              int majorDim = 0, long style = wxRA_HORIZONTAL,
              const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
              int n = 0, const wxString choices[] = NULL,
              int majorDim = 0, long style = wxRA_HORIZONTAL,

+#if wxUSE_VALIDATORS

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

+#endif

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


@@ -40,9 +42,13 @@ public:
              const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
              int n = 0, const wxString choices[] = NULL,
              int majorDim = 0, long style = wxRA_HORIZONTAL,
              const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
              int n = 0, const wxString choices[] = NULL,
              int majorDim = 0, long style = wxRA_HORIZONTAL,

+#if wxUSE_VALIDATORS

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

+#endif

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

+  virtual WXHBRUSH OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
+                              WXUINT message, WXWPARAM wParam, WXLPARAM lParam);

 
   int FindString(const wxString& s) const;
   void SetSelection(int N);
 
   int FindString(const wxString& s) const;
   void SetSelection(int N);


@@ -52,10 +58,9 @@ public:
   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;
 

-  void SetLabel(const wxString& label);
-  void SetLabel(int item, const wxString& label) ;
+  void SetLabel(int item, const wxString& label);
+  void SetLabel(int item, wxBitmap *bitmap);

   wxString GetLabel(int item) const;
   wxString GetLabel(int item) const;

-  wxString GetLabel() const;

   bool Show(bool show);
   void SetFocus();
   bool Enable(bool enable);
   bool Show(bool show);
   void SetFocus();
   bool Enable(bool enable);


@@ -72,6 +77,24 @@ public:
   inline int GetNumberOfRowsOrCols() const { return m_noRowsOrCols; }
   inline void SetNumberOfRowsOrCols(int n) { m_noRowsOrCols = n; }
 
   inline int GetNumberOfRowsOrCols() const { return m_noRowsOrCols; }
   inline void SetNumberOfRowsOrCols(int n) { m_noRowsOrCols = n; }
 

+  // implementation only from now on
+  // -------------------------------
+
+  WXHWND *GetRadioButtons() const { return m_radioButtons; }
+  bool ContainsHWND(WXHWND hWnd) const;
+  void SendNotificationEvent();
+
+  // get the number of buttons per column/row
+  int GetNumVer() const;
+  int GetNumHor() const;
+
+#if WXWIN_COMPATIBILITY
+  wxRadioBox(wxWindow *parent, wxFunction func, const char *title,
+             int x = -1, int y = -1, int width = -1, int height = -1,
+             int n = 0, char **choices = NULL,
+             int majorDim = 0, long style = wxRA_HORIZONTAL, const char *name = wxRadioBoxNameStr);
+#endif // WXWIN_COMPATIBILITY
+

 protected:
   void SubclassRadioButton(WXHWND hWndBtn);
 
 protected:
   void SubclassRadioButton(WXHWND hWndBtn);
 


@@ -87,6 +110,11 @@ protected:
   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);

+private:
+  virtual void SetLabel(const wxString& label)
+  { wxWindowBase::SetLabel(label); }
+  wxString GetLabel() const
+  { return(wxWindowBase::GetLabel()); }

 };
 
 #endif
 };
 
 #endif