X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1e6feb95a79834836e88143b15d9f424ebe79621..22d080f35b173d2a855078d11e6b142b4e6d79a7:/include/wx/gtk1/radiobox.h

diff --git a/include/wx/gtk1/radiobox.h b/include/wx/gtk1/radiobox.h
index 16af2a2668..cfdcef9c94 100644
--- a/include/wx/gtk1/radiobox.h
+++ b/include/wx/gtk1/radiobox.h
@@ -1,17 +1,17 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        radiobox.h
+// Name:        wx/gtk/radiobox.h
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:           wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 
 #ifndef __GTKRADIOBOXH__
 #define __GTKRADIOBOXH__
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma interface
 #endif
 
@@ -34,15 +34,30 @@ public:
                const wxString choices[] = (const wxString *) NULL,
                int majorDim = 1,
                long style = wxRA_HORIZONTAL,
-               const wxValidator& val = wxDefaultValidator, 
+               const wxValidator& val = wxDefaultValidator,
                const wxString& name = wxRadioBoxNameStr)
     {
         Init();
 
         Create( parent, id, title, pos, size, n, choices, majorDim, style, val, name );
     }
+    wxRadioBox(wxWindow *parent,
+               wxWindowID id,
+               const wxString& title,
+               const wxPoint& pos,
+               const wxSize& size,
+               const wxArrayString& choices,
+               int majorDim = 1,
+               long style = wxRA_HORIZONTAL,
+               const wxValidator& val = wxDefaultValidator,
+               const wxString& name = wxRadioBoxNameStr)
+    {
+        Init();
+
+        Create( parent, id, title, pos, size, choices, majorDim, style, val, name );
+    }
 
-    ~wxRadioBox();
+    virtual ~wxRadioBox();
     bool Create(wxWindow *parent,
                 wxWindowID id,
                 const wxString& title,
@@ -52,40 +67,53 @@ public:
                 const wxString choices[] = (const wxString *) NULL,
                 int majorDim = 0,
                 long style = wxRA_HORIZONTAL,
-                const wxValidator& val = wxDefaultValidator, 
+                const wxValidator& val = wxDefaultValidator,
+                const wxString& name = wxRadioBoxNameStr);
+    bool Create(wxWindow *parent,
+                wxWindowID id,
+                const wxString& title,
+                const wxPoint& pos,
+                const wxSize& size,
+                const wxArrayString& choices,
+                int majorDim = 0,
+                long style = wxRA_HORIZONTAL,
+                const wxValidator& val = wxDefaultValidator,
                 const wxString& name = wxRadioBoxNameStr);
 
     int FindString( const wxString& s) const;
     void SetSelection( int n );
     int GetSelection() const;
-    
+
     wxString GetString( int n ) const;
-    
-    wxString GetLabel( int item ) const;
-    wxString GetLabel() const { return wxControl::GetLabel(); }
-    void SetLabel( const wxString& label );
-    void SetLabel( int item, const wxString& label );
-    
-    /* doesn't work */
-    void SetLabel( int item, wxBitmap *bitmap );
-    
-    bool Show( bool show );
+    void SetString( int n, const wxString& label );
+
     void Show( int item, bool show );
-    
-    bool Enable( bool enable );
     void Enable( int item, bool enable );
-    
+
     virtual wxString GetStringSelection() const;
     virtual bool SetStringSelection( const wxString& s );
-    
-    int Number() const;
-    int GetCount() const { return Number(); }
+
+    int GetCount() const;
     int GetNumberOfRowsOrCols() const;
     void SetNumberOfRowsOrCols( int n );
-    
+
+    // for compatibility only, don't use these methods in new code!
+#if WXWIN_COMPATIBILITY_2_2
+    int Number() const { return GetCount(); }
+    wxString GetLabel(int n) const { return GetString(n); }
+    void SetLabel( int item, const wxString& label )
+        { SetString(item, label); }
+#endif // WXWIN_COMPATIBILITY_2_2
+
+    // we have to override those to avoid virtual function name hiding
+    virtual wxString GetLabel() const { return wxControl::GetLabel(); }
+    virtual void SetLabel( const wxString& label );
+    virtual bool Show( bool show = TRUE );
+    virtual bool Enable( bool enable = TRUE );
+
     // implementation
     // --------------
-    
+
     void SetFocus();
     void GtkDisableEvents();
     void GtkEnableEvents();
@@ -94,18 +122,23 @@ public:
 #if wxUSE_TOOLTIPS
     void ApplyToolTip( GtkTooltips *tips, const wxChar *tip );
 #endif // wxUSE_TOOLTIPS
-    wxSize LayoutItems();
+
+    // reposition the radio buttons correctly unless justCalc == true and
+    // reutrn the total size needed to accomodate 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_alreadySent;
+
     bool             m_hasFocus,
                      m_lostFocus;
     int              m_majorDim;
     wxList           m_boxes;
 
 protected:
+    // implement some base class methods
+    virtual wxSize DoGetBestSize() const;
+
     // common part of all ctors
     void Init();