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

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

diff --git a/include/wx/msw/choice.h b/include/wx/msw/choice.h
index a70061a06feb9e8aecb77229b21b4afba7fa2a64..c7518c79b8e081470b9506b2a57450965373b3a0 100644 (file)
--- a/include/wx/msw/choice.h
+++ b/include/wx/msw/choice.h
@@ -5,12 +5,12 @@
 // 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 __CHOICEH__
-#define __CHOICEH__
+#ifndef _WX_CHOICE_H_
+#define _WX_CHOICE_H_
 
 #ifdef __GNUG__
 #pragma interface "choice.h"
@@ -26,9 +26,7 @@ class WXDLLEXPORT wxChoice: public wxControl
   DECLARE_DYNAMIC_CLASS(wxChoice)
 
  public:
-  int no_strings;
-
-  inline wxChoice(void) { no_strings = 0; }
+  inline wxChoice(void) { m_noStrings = 0; }
 
   inline wxChoice(wxWindow *parent, wxWindowID id,
            const wxPoint& pos = wxDefaultPosition,
@@ -57,10 +55,13 @@ class WXDLLEXPORT wxChoice: public wxControl
   virtual int FindString(const wxString& s) const;
   virtual wxString GetString(int n) const ;
   virtual 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); }
   virtual wxString GetStringSelection(void) const ;
   virtual bool SetStringSelection(const wxString& sel);
 
-  virtual inline int Number(void) const { return no_strings; }
+  virtual inline int Number(void) const { return m_noStrings; }
   virtual void Command(wxCommandEvent& event);
 
   virtual bool MSWCommand(WXUINT param, WXWORD id);
@@ -72,7 +73,11 @@ class WXDLLEXPORT wxChoice: public wxControl
                        WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
 
   long MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
+
+protected:
+  int       m_noStrings;
+
 };
 
 #endif
-       // __CHOICEH__
+       // _WX_CHOICE_H_