conversions from int/long to wxString won't compile any more

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

diff --git a/include/wx/msw/radiobox.h b/include/wx/msw/radiobox.h
index 36c1882277138a8a4254b3992e4412f06a6b1759..6d86bed7422c4d8ef8349387da1fd6e5abe41648 100644 (file)
--- a/include/wx/msw/radiobox.h
+++ b/include/wx/msw/radiobox.h
@@ -5,12 +5,12 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$

-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:    wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:    wxWindows licence

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

-#ifndef __RADIOBOXH__
-#define __RADIOBOXH__
+#ifndef _WX_RADIOBOX_H_
+#define _WX_RADIOBOX_H_

 
 #ifdef __GNUG__
 #pragma interface "radiobox.h"
 
 #ifdef __GNUG__
 #pragma interface "radiobox.h"


@@ -49,20 +49,20 @@ public:
 
 #endif
 
 
 #endif
 

-  inline wxRadioBox(wxWindow *parent, const wxWindowID id, const wxString& title,
+  inline wxRadioBox(wxWindow *parent, wxWindowID id, const wxString& title,

              const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
              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,
+             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);
   }
 
 /*
              const wxValidator& val = wxDefaultValidator, const wxString& name = wxRadioBoxNameStr)
   {
     Create(parent, id, title, pos, size, n, choices, majorDim, style, val, name);
   }
 
 /*

-  wxRadioBox(wxWindow *parent, const wxWindowID id, const wxString& title,
+  wxRadioBox(wxWindow *parent, wxWindowID id, const wxString& title,

              const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
              const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,

-             const int n = 0, const wxBitmap *choices[] = NULL,
-             const int majorDim = 0, const long style = wxRA_HORIZONTAL,
+             int n = 0, const wxBitmap *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);
              const wxValidator& val = wxDefaultValidator, const wxString& name = wxRadioBoxNameStr)
   {
     Create(parent, id, title, pos, size, n, choices, majorDim, style, val, name);


@@ -71,41 +71,50 @@ public:
 
   ~wxRadioBox(void);
 
 
   ~wxRadioBox(void);
 

-  bool Create(wxWindow *parent, const wxWindowID id, const wxString& title,
+  bool Create(wxWindow *parent, wxWindowID id, const wxString& title,

              const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
              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,
+             int n = 0, const wxString choices[] = NULL,
+             int majorDim = 0, long style = wxRA_HORIZONTAL,

              const wxValidator& val = wxDefaultValidator, const wxString& name = wxRadioBoxNameStr);
 
 /*
              const wxValidator& val = wxDefaultValidator, const wxString& name = wxRadioBoxNameStr);
 
 /*

-  bool Create(wxWindow *parent, const wxWindowID id, const wxString& title,
+  bool Create(wxWindow *parent, wxWindowID id, const wxString& title,

              const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
              const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,

-             const int n = 0, const wxBitmap *choices[] = NULL,
-             const int majorDim = 0, const long style = wxRA_HORIZONTAL,
+             int n = 0, const wxBitmap *choices[] = NULL,
+             int majorDim = 0, long style = wxRA_HORIZONTAL,

              const wxValidator& val = wxDefaultValidator, const wxString& name = wxRadioBoxNameStr);
 */
 
              const wxValidator& val = wxDefaultValidator, const wxString& name = wxRadioBoxNameStr);
 */
 

-  virtual bool MSWCommand(const WXUINT param, const WXWORD id);
-  virtual WXHBRUSH OnCtlColor(const WXHDC pDC, const WXHWND pWnd, const WXUINT nCtlColor,
+  virtual bool MSWCommand(WXUINT param, WXWORD id);
+  virtual WXHBRUSH OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,

                        WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
 
   int FindString(const wxString& s) const;
                        WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
 
   int FindString(const wxString& s) const;

-  void SetSelection(const int N);
+  void SetSelection(int N);

   int GetSelection(void) const;
   int GetSelection(void) const;

-  wxString GetString(const int N) const;
-  void SetSize(const int x, const int y, const int width, const int height, const int sizeFlags = wxSIZE_AUTO);
+  wxString GetString(int N) const;
+
+  void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
+  void SetSize(const wxRect& rect, int sizeFlags = wxSIZE_AUTO)
+    { wxWindow::SetSize(rect, sizeFlags); }
+  void SetSize(const wxSize& size) { wxWindow::SetSize(size); }
+

   void GetSize(int *x, int *y) const;
   void GetSize(int *x, int *y) const;

+  wxSize GetSize() const { return wxWindow::GetSize(); }
+

   void GetPosition(int *x, int *y) const;
   void GetPosition(int *x, int *y) const;

+  wxPoint GetPosition() const { return wxWindow::GetPosition(); }
+

   wxString GetLabel(void) const;
   void SetLabel(const wxString& label);
   wxString GetLabel(void) const;
   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 SetLabel(int item, const wxString& label) ;
+  void SetLabel(int item, wxBitmap *bitmap) ;
+  wxString GetLabel(int item) const;
+  bool Show(bool show);

   void SetFocus(void);
   void SetFocus(void);

-  void Enable(const bool enable);
-  void Enable(const int item, const bool enable);
-  void Show(const int item, const bool show) ;
+  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); }
 
   inline void SetLabelFont(const wxFont& WXUNUSED(font)) {};
   inline void SetButtonFont(const wxFont& font) { SetFont(font); }
 


@@ -115,12 +124,14 @@ public:
   void Command(wxCommandEvent& event);
   
   inline int GetNumberOfRowsOrCols(void) const { return m_noRowsOrCols; }
   void Command(wxCommandEvent& event);
   
   inline int GetNumberOfRowsOrCols(void) const { return m_noRowsOrCols; }

-  inline void SetNumberOfRowsOrCols(const int n) { m_noRowsOrCols = n; }
+  inline void SetNumberOfRowsOrCols(int n) { m_noRowsOrCols = n; }

 
   // Implementation
   inline WXHWND *GetRadioButtons(void) const { return m_radioButtons; }
   bool ContainsHWND(WXHWND hWnd) const ;
 
 
   // Implementation
   inline WXHWND *GetRadioButtons(void) const { return m_radioButtons; }
   bool ContainsHWND(WXHWND hWnd) const ;
 

+  long MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
+

 protected:
   WXHWND *          m_radioButtons;
   int               m_majorDim ;
 protected:
   WXHWND *          m_radioButtons;
   int               m_majorDim ;


@@ -134,4 +145,4 @@ protected:
 };
 
 #endif
 };
 
 #endif

-    // __RADIOBOXH__
+    // _WX_RADIOBOX_H_