Added support for extra bitmap for toggled tool.

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

diff --git a/include/wx/gtk/radiobox.h b/include/wx/gtk/radiobox.h
index 7282de301c19f8f16f9619595adc63d19ababdd8..a73c1a608e49cdf0a52bb1b63f900ce26f44d4d9 100644 (file)
--- a/include/wx/gtk/radiobox.h
+++ b/include/wx/gtk/radiobox.h
@@ -2,10 +2,9 @@
 // Name:        radiobox.h
 // Purpose:
 // Author:      Robert Roebling
 // Name:        radiobox.h
 // Purpose:
 // Author:      Robert Roebling

-// Created:     01/02/97
-// Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
-// Licence:    wxWindows licence
+// Id:          $Id$
+// Copyright:   (c) 1998 Robert Roebling
+// Licence:           wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 
 /////////////////////////////////////////////////////////////////////////////
 
 


@@ -43,42 +42,66 @@ class wxRadioBox: public wxControl
 
   DECLARE_DYNAMIC_CLASS(wxRadioBox)
   
 
   DECLARE_DYNAMIC_CLASS(wxRadioBox)
   

-  public:
-  
-    wxRadioBox(void);
-    wxRadioBox( wxWindow *parent, const wxWindowID id, const wxString& title,
-      const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, 
-      const int n = 0, const wxString choices[] = NULL,
-      const int majorDim = 0, const long style = wxRA_HORIZONTAL,
-      const wxString &name = wxRadioBoxNameStr );
-    bool Create( wxWindow *parent, const wxWindowID id, const wxString& title,
-      const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, 
-      const int n = 0, const wxString choices[] = NULL,
-      const int majorDim = 0, const long style = wxRA_HORIZONTAL,
-      const wxString &name = wxRadioBoxNameStr );
+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 )
+    {
+      Create( parent, id, title, pos, size, n, 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 );
+            

     int FindString( const wxString& s) const;
     int FindString( const wxString& s) const;

-    void SetSelection( const int n );
-    int GetSelection(void) const;
-    wxString GetString( const int n ) const;
-    wxString GetLabel(void) 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( const wxString& label );

-    void SetLabel( const int item, const wxString& label );
-    void SetLabel( const int item, wxBitmap *bitmap );
-    wxString GetLabel( const int item ) const;
-    bool Show( const bool show );
-    void Enable( const bool enable );
-    void Enable( const int item, const bool enable );
-    void Show( const int item, const bool show );
-    virtual wxString GetStringSelection(void) const;
+    void SetLabel( int item, const wxString& label );
+    
+    /* doesn't work */
+    void SetLabel( int item, wxBitmap *bitmap );
+    
+    bool Show( bool show );
+    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 bool SetStringSelection( const wxString& s );

-    virtual int Number(void) const;
-    int GetNumberOfRowsOrCols(void) const;
-    void SetNumberOfRowsOrCols( const int n );

     
     

-  private:
-  
-    GtkRadioButton *m_radio;
+    virtual int Number() const;
+    int GetNumberOfRowsOrCols() const;
+    void SetNumberOfRowsOrCols( int n );
+    
+    void OnSize( wxSizeEvent &event );
+    void SetFocus();
+    
+  // implementation    
+    
+    bool IsOwnGtkWindow( GdkWindow *window );
+    void ApplyWidgetStyle();
+    wxSize LayoutItems();
+    
+    bool             m_alreadySent;
+    int              m_majorDim;
+    wxList           m_boxes;

     
     

+  DECLARE_EVENT_TABLE()    

 };
 
 #endif // __GTKRADIOBOXH__
 };
 
 #endif // __GTKRADIOBOXH__