merged in the commit from the 2.2 branch

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

diff --git a/include/wx/qt/radiobox.h b/include/wx/qt/radiobox.h
index a8fdd1ebe34913d24aeed4d1542f4252c8341751..cb7c5ba405b0d9c353e39f5b08f51d58bbff5917 100644 (file)
--- a/include/wx/qt/radiobox.h
+++ b/include/wx/qt/radiobox.h
@@ -1,80 +1,88 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        radiobox.h
-// Purpose:
-// Author:      Robert Roebling
-// Created:     01/02/97
-// Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
+// Purpose:     wxRadioBox class
+// Author:      AUTHOR
+// Modified by:
+// Created:     ??/??/98
+// RCS-ID:      $Id$
+// Copyright:   (c) AUTHOR
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-
-#ifndef __GTKRADIOBOXH__
-#define __GTKRADIOBOXH__
+#ifndef _WX_RADIOBOX_H_
+#define _WX_RADIOBOX_H_
 
 #ifdef __GNUG__
-#pragma interface
+#pragma interface "radiobox.h"
 #endif
 
-#include "wx/defs.h"
-#include "wx/object.h"
-#include "wx/list.h"
 #include "wx/control.h"
-#include "wx/bitmap.h"
 
-//-----------------------------------------------------------------------------
-// classes
-//-----------------------------------------------------------------------------
+WXDLLEXPORT_DATA(extern const char*) wxRadioBoxNameStr;
 
-class wxRadioBox;
+// List box item
+class WXDLLEXPORT wxBitmap ;
 
-//-----------------------------------------------------------------------------
-// global data
-//-----------------------------------------------------------------------------
+class WXDLLEXPORT wxRadioBox: public wxControl
+{
+  DECLARE_DYNAMIC_CLASS(wxRadioBox)
+public:
+  wxRadioBox();
 
-extern const char *wxRadioBoxNameStr;
+  inline 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 wxValidator& val = wxDefaultValidator, const wxString& name = wxRadioBoxNameStr)
+  {
+    Create(parent, id, title, pos, size, n, choices, majorDim, style, val, name);
+  }
 
-//-----------------------------------------------------------------------------
-// wxRadioBox
-//-----------------------------------------------------------------------------
+  ~wxRadioBox();
 
-class wxRadioBox: public wxControl
-{
+  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 wxValidator& val = wxDefaultValidator, const wxString& name = wxRadioBoxNameStr);
 
-  DECLARE_DYNAMIC_CLASS(wxRadioBox)
-  
-  public:
+  int FindString(const wxString& s) const;
+  void SetSelection(int N);
+  int GetSelection() const;
+  wxString GetString(int N) const;
+  void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
+  void GetSize(int *x, int *y) const;
+  void GetPosition(int *x, int *y) const;
+  wxString GetLabel() const;
+  void SetLabel(const wxString& label);
+  void SetLabel(int item, const wxString& label) ;
+  wxString GetLabel(int item) const;
+  bool Show(bool show);
+  void SetFocus();
+  void Enable(bool enable);
+  void Enable(int item, bool enable);
+  void Show(int item, bool show) ;
+  inline void SetLabelFont(const wxFont& WXUNUSED(font)) {};
+  inline void SetButtonFont(const wxFont& font) { SetFont(font); }
+
+  virtual wxString GetStringSelection() const;
+  virtual bool SetStringSelection(const wxString& s);
+  inline virtual int Number() const { return m_noItems; } ;
+  void Command(wxCommandEvent& event);
   
-    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 );
-    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 );
-    int FindString( const wxString& s) const;
-    void SetSelection( int n );
-    int GetSelection(void) const;
-    wxString GetString( int n ) const;
-    wxString GetLabel(void) const;
-    void SetLabel( const wxString& label );
-    void SetLabel( int item, const wxString& label );
-    void SetLabel( int item, wxBitmap *bitmap );
-    wxString GetLabel( int item ) const;
-    bool Show( bool show );
-    void Enable( bool enable );
-    void Enable( int item, bool enable );
-    void Show( int item, bool show );
-    virtual wxString GetStringSelection(void) const;
-    virtual bool SetStringSelection( const wxString& s );
-    virtual int Number(void) const;
-    int GetNumberOfRowsOrCols(void) const;
-    void SetNumberOfRowsOrCols( int n );
-    
+  inline int GetNumberOfRowsOrCols() const { return m_noRowsOrCols; }
+  inline void SetNumberOfRowsOrCols(int n) { m_noRowsOrCols = n; }
+
+protected:
+/* TODO: implementation
+  WXHWND *          m_radioButtons;
+*/
+  int               m_majorDim ;
+  int               m_noItems;
+  int               m_noRowsOrCols;
+  int               m_selectedButton;
+
 };
 
-#endif // __GTKRADIOBOXH__
+#endif
+    // _WX_RADIOBOX_H_