for Gray Controls implementation

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

diff --git a/include/wx/gtk1/radiobox.h b/include/wx/gtk1/radiobox.h
index c1218fc449dbd900c3cad34733410013921b7b39..06402b021a428cf6e84280c9c8a5460eaa5ecfbd 100644 (file)
--- a/include/wx/gtk1/radiobox.h
+++ b/include/wx/gtk1/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

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


@@ -17,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"


@@ -40,48 +42,71 @@ extern const char *wxRadioBoxNameStr;
 
 class wxRadioBox: public wxControl
 {
 
 class wxRadioBox: public wxControl
 {

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

-      const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
-      int n = 0, const wxString choices[] = NULL,
-      int majorDim = 0, long style = wxRA_HORIZONTAL,
-      const wxString &name = wxRadioBoxNameStr );
+             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;
     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(void) 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 Enable( bool enable );
-    void Enable( int item, bool enable );

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

-    virtual wxString GetStringSelection(void) const;
+    
+    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;
+    
+    virtual int Number() const;
+    int GetNumberOfRowsOrCols() const;

     void SetNumberOfRowsOrCols( int n );
     void SetNumberOfRowsOrCols( int n );

-
-  private:
-  
-    GtkRadioButton *m_radio;

     
     

-  public:
-  
-    bool            m_alreadySent;
+    void SetFocus();
+    
+  // implementation    
+    
+    void DisableEvents();
+    void EnableEvents();
+    bool IsOwnGtkWindow( GdkWindow *window );
+    void ApplyWidgetStyle();
+    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;
+    
+private:
+    DECLARE_DYNAMIC_CLASS(wxRadioBox)

 };
 
 };
 

+#endif
+

 #endif // __GTKRADIOBOXH__
 #endif // __GTKRADIOBOXH__