don't use a floating point value as a boolean flag; gcc4 (correctly) complains when...

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

diff --git a/include/wx/gtk/radiobox.h b/include/wx/gtk/radiobox.h
index ff0fc1dbfac0ebaba6196c111a00da831653ce2b..c945aab081dead612a3f976cb272bc7f8b71db21 100644 (file)
--- a/include/wx/gtk/radiobox.h
+++ b/include/wx/gtk/radiobox.h
@@ -7,21 +7,16 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-

 #ifndef __GTKRADIOBOXH__
 #define __GTKRADIOBOXH__
 
 #ifndef __GTKRADIOBOXH__
 #define __GTKRADIOBOXH__
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface
-#endif
-

 #include "wx/bitmap.h"
 
 //-----------------------------------------------------------------------------
 // wxRadioBox
 //-----------------------------------------------------------------------------
 
 #include "wx/bitmap.h"
 
 //-----------------------------------------------------------------------------
 // wxRadioBox
 //-----------------------------------------------------------------------------
 

-class wxRadioBox: public wxControl
+class WXDLLIMPEXP_CORE wxRadioBox: public wxControl

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


@@ -80,15 +75,15 @@ public:
                 const wxValidator& val = wxDefaultValidator,
                 const wxString& name = wxRadioBoxNameStr);
 
                 const wxValidator& val = wxDefaultValidator,
                 const wxString& name = wxRadioBoxNameStr);
 

-    int FindString( const wxString& s) const;
+    virtual int FindString(const wxString& s, bool bCase = false) const;

     void SetSelection( int n );
     int GetSelection() const;
 
     wxString GetString( int n ) const;
     void SetString( int n, const wxString& label );
 
     void SetSelection( int n );
     int GetSelection() const;
 
     wxString GetString( int n ) const;
     void SetString( int n, const wxString& label );
 

-    void Show( int item, bool show );
-    void Enable( int item, bool enable );
+    virtual bool Show( int item, bool show = true );
+    virtual bool Enable( int item, bool enable = true );

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


@@ -123,11 +118,6 @@ public:
     void ApplyToolTip( GtkTooltips *tips, const wxChar *tip );
 #endif // wxUSE_TOOLTIPS
 
     void ApplyToolTip( GtkTooltips *tips, const wxChar *tip );
 #endif // wxUSE_TOOLTIPS
 

-    // reposition the radio buttons correctly unless justCalc == true and
-    // return the total size needed to accommodate them
-    wxSize LayoutItems(bool justCalc) const;
-
-    virtual void DoSetSize( int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO );

     virtual void OnInternalIdle();
 
     bool             m_hasFocus,
     virtual void OnInternalIdle();
 
     bool             m_hasFocus,


@@ -136,12 +126,13 @@ public:
     wxList           m_boxes;
 
 protected:
     wxList           m_boxes;
 
 protected:

-    // implement some base class methods
-    virtual wxSize DoGetBestSize() const;
-

     // common part of all ctors
     void Init();
 
     // common part of all ctors
     void Init();
 

+    // check that the index is valid
+    // FIXME: remove once GTK will derive from wxRadioBoxBase
+    inline bool IsValid(int n) const { return n >= 0 && n < GetCount(); }
+

 private:
     DECLARE_DYNAMIC_CLASS(wxRadioBox)
 };
 private:
     DECLARE_DYNAMIC_CLASS(wxRadioBox)
 };