Next try at avoiding too few or too many size events.

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

diff --git a/include/wx/gtk1/radiobox.h b/include/wx/gtk1/radiobox.h
index 2c2e72ec8b0c3c2a8d88f5d416a709c8e141587f..eded3b86e93eea564e10e8f25ae876107a2421c5 100644 (file)
--- a/include/wx/gtk1/radiobox.h
+++ b/include/wx/gtk1/radiobox.h
@@ -16,6 +16,9 @@
 #endif
 
 #include "wx/defs.h"
 #endif
 
 #include "wx/defs.h"

+
+#if wxUSE_RADIOBOX
+

 #include "wx/object.h"
 #include "wx/list.h"
 #include "wx/control.h"
 #include "wx/object.h"
 #include "wx/list.h"
 #include "wx/control.h"


@@ -39,12 +42,8 @@ extern const char *wxRadioBoxNameStr;
 
 class wxRadioBox: public wxControl
 {
 
 class wxRadioBox: public wxControl
 {

-
-  DECLARE_DYNAMIC_CLASS(wxRadioBox)
-  
-  public:
-  
-    wxRadioBox(void);
+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,
     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,


@@ -61,38 +60,56 @@ class wxRadioBox: public wxControl
              int majorDim = 0, long style = wxRA_HORIZONTAL,
              const wxValidator& val = wxDefaultValidator, 
              const wxString& name = wxRadioBoxNameStr );
              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 FindString( const wxString& s) const;
     void SetSelection( int n );

-    int GetSelection(void) const;
+    int GetSelection() const;
+    

     wxString GetString( int n ) 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 );
     void SetLabel( const wxString& label );
     void SetLabel( int item, const wxString& label );

+    
+    /* doesn't work */

     void SetLabel( int item, wxBitmap *bitmap );
     void SetLabel( int item, wxBitmap *bitmap );

-    wxString GetLabel( int item ) const;
+    

     bool Show( bool show );
     bool Show( bool show );

+    void Show( int item, bool show );
+    

     bool Enable( bool enable );
     void Enable( int item, bool enable );
     bool Enable( bool enable );
     void Enable( int item, bool enable );

-    void Show( int item, bool show );
-    virtual wxString GetStringSelection(void) const;
+    
+    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( int n );

     
     

-    void OnSize( wxSizeEvent &event );
-    void SetFocus();
+    virtual int Number() const;
+    int GetNumberOfRowsOrCols() const;
+    void SetNumberOfRowsOrCols( int n );

     
     

-  // implementation    
+    // implementation
+    // --------------

     
     

+    void SetFocus();
+    void GtkDisableEvents();
+    void GtkEnableEvents();

     bool IsOwnGtkWindow( GdkWindow *window );
     void ApplyWidgetStyle();
     bool IsOwnGtkWindow( GdkWindow *window );
     void ApplyWidgetStyle();

+#if wxUSE_TOOLTIPS
+    void ApplyToolTip( GtkTooltips *tips, const wxChar *tip );
+#endif // wxUSE_TOOLTIPS

     wxSize LayoutItems();
     wxSize LayoutItems();

+    void DoSetSize( int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO );

     
     bool             m_alreadySent;
     int              m_majorDim;
     wxList           m_boxes;
     
     
     bool             m_alreadySent;
     int              m_majorDim;
     wxList           m_boxes;
     

-  DECLARE_EVENT_TABLE()    
+private:
+    DECLARE_DYNAMIC_CLASS(wxRadioBox)

 };
 
 };
 

+#endif
+

 #endif // __GTKRADIOBOXH__
 #endif // __GTKRADIOBOXH__