rename Inside(x,y) parameters to avoid gcc warnings about parameters shadowing member...

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

diff --git a/include/wx/os2/radiobox.h b/include/wx/os2/radiobox.h
index 8b1e97a9c0beffb3b25a433ee675eaa5a1526031..eb790894cecc174ee93baa4f47ae54f59bef0441 100644 (file)
--- a/include/wx/os2/radiobox.h
+++ b/include/wx/os2/radiobox.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:     wxRadioBox class
 // Author:      David Webster
 // Modified by:
 // Purpose:     wxRadioBox class
 // Author:      David Webster
 // Modified by:


@@ -29,9 +29,7 @@ public:
                       ,const wxString     asChoices[] = NULL
                       ,int                nMajorDim = 0
                       ,long               lStyle = wxRA_HORIZONTAL
                       ,const wxString     asChoices[] = NULL
                       ,int                nMajorDim = 0
                       ,long               lStyle = wxRA_HORIZONTAL

-#if wxUSE_VALIDATORS

                       ,const wxValidator& rVal = wxDefaultValidator
                       ,const wxValidator& rVal = wxDefaultValidator

-#endif

                       ,const wxString&    rsName = wxRadioBoxNameStr
                      )
     {
                       ,const wxString&    rsName = wxRadioBoxNameStr
                      )
     {


@@ -44,14 +42,37 @@ public:
                ,asChoices
                ,nMajorDim
                ,lStyle
                ,asChoices
                ,nMajorDim
                ,lStyle

-#if wxUSE_VALIDATORS

                ,rVal
                ,rVal

-#endif

                ,rsName
               );
     }
 
                ,rsName
               );
     }
 

-    ~wxRadioBox();
+    inline wxRadioBox( wxWindow*            pParent
+                      ,wxWindowID           vId
+                      ,const wxString&      rsTitle
+                      ,const wxPoint&       rPos
+                      ,const wxSize&        rSize
+                      ,const wxArrayString& asChoices
+                      ,int                  nMajorDim = 0
+                      ,long                 lStyle = wxRA_HORIZONTAL
+                      ,const wxValidator&   rVal = wxDefaultValidator
+                      ,const wxString&      rsName = wxRadioBoxNameStr
+                     )
+    {
+        Create( pParent
+               ,vId
+               ,rsTitle
+               ,rPos
+               ,rSize
+               ,asChoices
+               ,nMajorDim
+               ,lStyle
+               ,rVal
+               ,rsName
+              );
+    }
+
+    virtual ~wxRadioBox();

 
     bool Create( wxWindow*          pParent
                 ,wxWindowID         vId
 
     bool Create( wxWindow*          pParent
                 ,wxWindowID         vId


@@ -62,19 +83,42 @@ public:
                 ,const wxString     asChoices[] = NULL
                 ,int                nMajorDim = 0
                 ,long               lStyle = wxRA_HORIZONTAL
                 ,const wxString     asChoices[] = NULL
                 ,int                nMajorDim = 0
                 ,long               lStyle = wxRA_HORIZONTAL

-#if wxUSE_VALIDATORS

                 ,const wxValidator& rVal = wxDefaultValidator
                 ,const wxValidator& rVal = wxDefaultValidator

-#endif

                 ,const wxString&    rsName = wxRadioBoxNameStr
                );
 
                 ,const wxString&    rsName = wxRadioBoxNameStr
                );
 

-    void             Command(wxCommandEvent& rEvent);
-    bool             ContainsHWND(WXHWND hWnd) const;
-    virtual bool     Enable(bool bEnable = TRUE);
-    void             Enable( int  nItem
-                            ,bool bEnable
-                           );
-    int              FindString(const wxString& sStr) const;
+    bool Create( wxWindow*            pParent
+                ,wxWindowID           vId
+                ,const wxString&      rsTitle
+                ,const wxPoint&       rPos
+                ,const wxSize&        rSize
+                ,const wxArrayString& asChoices
+                ,int                  nMajorDim = 0
+                ,long                 lStyle = wxRA_HORIZONTAL
+                ,const wxValidator&   rVal = wxDefaultValidator
+                ,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;

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


@@ -87,10 +131,6 @@ public:
                                 ,WXWORD wId
                                );
     void             SendNotificationEvent(void);
                                 ,WXWORD wId
                                );
     void             SendNotificationEvent(void);

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

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


@@ -99,49 +139,30 @@ 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 bool     SetStringSelection(const wxString& rsStr);
-
-                   void     SetLabel( int             nItem
-                                     ,const wxString& rsLabel
-                                    );
-                   void     SetLabel( int       item
-                                     ,wxBitmap* pBitmap
-                                    );
-                   wxString GetLabel(int nItem) const;
+           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)
+        { wxControl::SetLabel(rsLabel); }
+    virtual wxString GetLabel() const
+        { return wxControl::GetLabel(); }

 
 

+    void SetLabel( int nItem, const wxString& rsLabel );
+    void SetLabel( int item, wxBitmap* pBitmap );
+    wxString GetLabel(int nItem) const;

 
 protected:
     virtual wxSize DoGetBestSize(void) const;
 
 protected:
     virtual wxSize DoGetBestSize(void) const;


@@ -151,28 +172,22 @@ protected:
                              ,int nHeight
                              ,int nSizeFlags = wxSIZE_AUTO
                             );
                              ,int nHeight
                              ,int nSizeFlags = wxSIZE_AUTO
                             );

-    wxSize         GetMaxButtonSize(void) const;
-    wxSize         GetTotalButtonSize(const wxSize& rSizeBtn) const;
-    void           SubclassRadioButton(WXHWND hWndBtn);
+    wxSize GetMaxButtonSize(void) const;
+    wxSize GetTotalButtonSize(const wxSize& rSizeBtn) const;
+    void   SubclassRadioButton(WXHWND hWndBtn);

 
 
 
 

-    WXHWND*                         m_ahRadioButtons;
-    int                             m_nMajorDim ;
-    int*                            m_pnRadioWidth;  // for bitmaps
-    int*                            m_pnRadioHeight;
-    int                             m_nNoItems;
-    int                             m_nNoRowsOrCols;
-    int                             m_nSelectedButton;
-    int                             m_nSizeFlags;
+    WXHWND* m_ahRadioButtons;
+    int*    m_pnRadioWidth;  // for bitmaps
+    int*    m_pnRadioHeight;
+    int     m_nSelectedButton;
+    int     m_nSizeFlags;

 
 private:
 
 private:

-    inline wxString GetLabel() const
-    { return wxWindowBase::GetLabel(); }
-    inline void     SetLabel(const wxString& rsLabel)
-    { wxWindowBase::SetLabel(rsLabel); }
+
+    unsigned int m_nNoItems;

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

-#endif
-    // _WX_RADIOBOX_H_
+#endif // _WX_RADIOBOX_H_