moved duplicated wxRegionContain definitions to wx/region.h

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

diff --git a/include/wx/os2/radiobox.h b/include/wx/os2/radiobox.h
index f78e6e8cd3c0d71d3c31b435256a1b6a75810f4d..bc6257dfffcd5739d3e96772c59a1aac15d94619 100644 (file)
--- a/include/wx/os2/radiobox.h
+++ b/include/wx/os2/radiobox.h
@@ -99,10 +99,26 @@ public:
                 ,const wxString&      rsName = wxRadioBoxNameStr
                );
 
                 ,const wxString&      rsName = wxRadioBoxNameStr
                );
 

+    // Enabling
+    virtual bool Enable(bool bEnable = true);
+    virtual bool Enable(unsigned int nItem, bool bEnable = true);
+    virtual bool IsItemEnabled(unsigned int WXUNUSED(n)) const
+    {
+        /* TODO */
+        return true;
+    }
+
+    // Showing
+    virtual bool Show(bool bShow = true);
+    virtual bool Show(unsigned int nItem, bool bShow = true);
+    virtual bool IsItemShown(unsigned int WXUNUSED(n)) const
+    {
+        /* TODO */
+        return true;
+    }
+

     void Command(wxCommandEvent& rEvent);
     bool ContainsHWND(WXHWND hWnd) const;
     void Command(wxCommandEvent& rEvent);
     bool ContainsHWND(WXHWND hWnd) const;

-    virtual bool Enable(bool bEnable = true);
-    virtual bool Enable(int  nItem, bool bEnable = true);

 
     virtual WXHBRUSH OnCtlColor( WXHDC    hDC
                                 ,WXHWND   hWnd
 
     virtual WXHBRUSH OnCtlColor( WXHDC    hDC
                                 ,WXHWND   hWnd


@@ -115,8 +131,6 @@ public:
                                 ,WXWORD wId
                                );
     void             SendNotificationEvent(void);
                                 ,WXWORD wId
                                );
     void             SendNotificationEvent(void);

-    virtual bool     Show(int  nItem, bool bShow = true);
-    virtual bool     Show(bool bShow = true);

     MRESULT          WindowProc( WXUINT   uMsg
                                 ,WXWPARAM wParam
                                 ,WXLPARAM lParam
     MRESULT          WindowProc( WXUINT   uMsg
                                 ,WXWPARAM wParam
                                 ,WXLPARAM lParam


@@ -125,39 +139,20 @@ public:
 
 
 
 
 
 

-           virtual int      GetColumnCount(void) const;
-           virtual int      GetCount(void) const;
-    inline         int      GetNumberOfRowsOrCols(void) const { return m_nNoRowsOrCols; }
-                   int      GetNumHor(void) const;
-                   int      GetNumVer(void) const;
-                   void     GetPosition( int* pnX
-                                        ,int* pnY
-                                       ) const;
+           virtual unsigned int GetCount() const;

     inline         WXHWND*  GetRadioButtons(void) const { return m_ahRadioButtons; }
     inline         WXHWND*  GetRadioButtons(void) const { return m_ahRadioButtons; }

-           virtual int      GetRowCount(void) const;

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

-                   void     GetSize( int* pnX
-                                    ,int* pnY
-                                   ) const;
+                   void     GetSize(int* pnX, int* pnY) const;

     inline         int      GetSizeFlags(void) const { return m_nSizeFlags; }
     inline         int      GetSizeFlags(void) const { return m_nSizeFlags; }

-                   void     AdjustButtons( int nX
-                                          ,int nY
-                                          ,int nWidth
-                                          ,int nHeight
-                                          ,int nSizeFlags
-                                         );
-                   wxString GetString(int nIndex) const;
+           virtual wxString GetString(unsigned int nIndex) const;

            virtual wxString GetStringSelection(void) const;
 
     inline         void     SetButtonFont(const wxFont& rFont) { SetFont(rFont); }
                    void     SetFocus(void);
            virtual bool     SetFont(const wxFont& rFont);
     inline         void     SetLabelFont(const wxFont& WXUNUSED(font)) {};
            virtual wxString GetStringSelection(void) const;
 
     inline         void     SetButtonFont(const wxFont& rFont) { SetFont(rFont); }
                    void     SetFocus(void);
            virtual bool     SetFont(const wxFont& rFont);
     inline         void     SetLabelFont(const wxFont& WXUNUSED(font)) {};

-    inline         void     SetNumberOfRowsOrCols(int nNum) { m_nNoRowsOrCols = nNum; }
-                   void     SetSelection(int nIndex);
-           virtual void     SetString( int             nNum
-                                      ,const wxString& rsLabel
-                                     );
+           virtual void     SetSelection(int nIndex);
+           virtual void     SetString(unsigned int nNum, const wxString& rsLabel);

     virtual bool SetStringSelection(const wxString& rsStr);
 
     virtual void SetLabel(const wxString& rsLabel)
     virtual bool SetStringSelection(const wxString& rsStr);
 
     virtual void SetLabel(const wxString& rsLabel)


@@ -183,16 +178,15 @@ protected:
 
 
     WXHWND* m_ahRadioButtons;
 
 
     WXHWND* m_ahRadioButtons;

-    int     m_nMajorDim ;

     int*    m_pnRadioWidth;  // for bitmaps
     int*    m_pnRadioHeight;
     int*    m_pnRadioWidth;  // for bitmaps
     int*    m_pnRadioHeight;

-    int     m_nNoItems;
-    int     m_nNoRowsOrCols;

     int     m_nSelectedButton;
     int     m_nSizeFlags;
 
 private:
 
     int     m_nSelectedButton;
     int     m_nSizeFlags;
 
 private:
 

+    unsigned int m_nNoItems;
+

     DECLARE_DYNAMIC_CLASS(wxRadioBox)
 }; // end of wxRadioBox
 
     DECLARE_DYNAMIC_CLASS(wxRadioBox)
 }; // end of wxRadioBox