X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/953704c1c76cfb9cfb7b91f0e81f98c30d27eb56..034e3041693f90324cfa4d282ef44e6063738d83:/include/wx/gtk/radiobox.h

diff --git a/include/wx/gtk/radiobox.h b/include/wx/gtk/radiobox.h
index 0999008254..f506a1bbda 100644
--- a/include/wx/gtk/radiobox.h
+++ b/include/wx/gtk/radiobox.h
@@ -1,114 +1,152 @@
 /////////////////////////////////////////////////////////////////////////////
-// 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
 
-#include "wx/defs.h"
-
-#if wxUSE_RADIOBOX
-
-#include "wx/object.h"
-#include "wx/list.h"
-#include "wx/control.h"
 #include "wx/bitmap.h"
 
-//-----------------------------------------------------------------------------
-// classes
-//-----------------------------------------------------------------------------
-
-class wxRadioBox;
-
-//-----------------------------------------------------------------------------
-// global data
-//-----------------------------------------------------------------------------
-
-extern const char *wxRadioBoxNameStr;
-
 //-----------------------------------------------------------------------------
 // wxRadioBox
 //-----------------------------------------------------------------------------
 
 class wxRadioBox: public wxControl
 {
-
-  DECLARE_DYNAMIC_CLASS(wxRadioBox)
-  
 public:
-    wxRadioBox();
-    inline wxRadioBox( wxWindow *parent, wxWindowID id, const wxString& title,
-             const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
-             int n = 0, const wxString choices[] = (const wxString *) NULL,
-             int majorDim = 1, long style = wxRA_HORIZONTAL,
-             const wxValidator& val = wxDefaultValidator, 
-             const wxString& name = wxRadioBoxNameStr )
+    wxRadioBox() { Init(); }
+    wxRadioBox(wxWindow *parent,
+               wxWindowID id,
+               const wxString& title,
+               const wxPoint& pos = wxDefaultPosition,
+               const wxSize& size = wxDefaultSize,
+               int n = 0,
+               const wxString choices[] = (const wxString *) NULL,
+               int majorDim = 1,
+               long style = wxRA_HORIZONTAL,
+               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)
     {
-      Create( parent, id, title, pos, size, n, choices, majorDim, style, val, name );
+        Init();
+
+        Create( parent, id, title, pos, size, choices, majorDim, style, val, name );
     }
-    ~wxRadioBox(void);
-    bool Create( wxWindow *parent, wxWindowID id, const wxString& title,
-             const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
-             int n = 0, const wxString choices[] = (const wxString *) NULL,
-             int majorDim = 0, long style = wxRA_HORIZONTAL,
-             const wxValidator& val = wxDefaultValidator, 
-             const wxString& name = wxRadioBoxNameStr );
-	     
+
+    virtual ~wxRadioBox();
+    bool Create(wxWindow *parent,
+                wxWindowID id,
+                const wxString& title,
+                const wxPoint& pos = wxDefaultPosition,
+                const wxSize& size = wxDefaultSize,
+                int n = 0,
+                const wxString choices[] = (const wxString *) NULL,
+                int majorDim = 0,
+                long style = wxRA_HORIZONTAL,
+                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 );
-    
-    virtual int Number() const;
+
+    int GetCount() const;
     int GetNumberOfRowsOrCols() const;
     void SetNumberOfRowsOrCols( int n );
-    
-    void OnSize( wxSizeEvent &event );
+
+    // 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 );
+
+    static wxVisualAttributes
+    GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
+
+    // implementation
+    // --------------
+
     void SetFocus();
-    
-  // implementation    
-    
-    void DisableEvents();
-    void EnableEvents();
+    void GtkDisableEvents();
+    void GtkEnableEvents();
     bool IsOwnGtkWindow( GdkWindow *window );
-    void ApplyWidgetStyle();
-    wxSize LayoutItems();
-    
-    bool             m_alreadySent;
+    void DoApplyWidgetStyle(GtkRcStyle *style);
+#if 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,
+                     m_lostFocus;
     int              m_majorDim;
     wxList           m_boxes;
-    
-  DECLARE_EVENT_TABLE()    
-};
 
-#endif
+protected:
+    // implement some base class methods
+    virtual wxSize DoGetBestSize() const;
+
+    // common part of all ctors
+    void Init();
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxRadioBox)
+};
 
 #endif // __GTKRADIOBOXH__