compile fix for gcc

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

diff --git a/include/wx/msw/choice.h b/include/wx/msw/choice.h
index b25535e1423f13050dfd21674277feb8c57e47c3..654f1af915fc9723eef709817b2ac6bbf47bd876 100644 (file)
--- a/include/wx/msw/choice.h
+++ b/include/wx/msw/choice.h
@@ -2,77 +2,85 @@
 // Name:        choice.h
 // Purpose:     wxChoice class
 // Author:      Julian Smart
-// Modified by:
+// Modified by: Vadim Zeitlin to derive from wxChoiceBase
 // 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"
+    #pragma interface "choice.h"
 #endif
 
-#include "wx/control.h"
-
-WXDLLEXPORT_DATA(extern const char*) wxChoiceNameStr;
-
+// ----------------------------------------------------------------------------
 // Choice item
-class WXDLLEXPORT wxChoice: public wxControl
-{
-  DECLARE_DYNAMIC_CLASS(wxChoice)
-
- public:
-  int no_strings;
-
-  inline wxChoice(void) { no_strings = 0; }
-
-  inline wxChoice(wxWindow *parent, const wxWindowID id,
-           const wxPoint& pos = wxDefaultPosition,
-           const wxSize& size = wxDefaultSize,
-           const int n = 0, const wxString choices[] = NULL,
-           const long style = 0,
-           const wxValidator& validator = wxDefaultValidator,
-           const wxString& name = wxChoiceNameStr)
-  {
-    Create(parent, id, pos, size, n, choices, style, validator, name);
-  }
-
-  bool Create(wxWindow *parent, const wxWindowID id,
-           const wxPoint& pos = wxDefaultPosition,
-           const wxSize& size = wxDefaultSize,
-           const int n = 0, const wxString choices[] = NULL,
-           const long style = 0,
-           const wxValidator& validator = wxDefaultValidator,
-           const wxString& name = wxChoiceNameStr);
+// ----------------------------------------------------------------------------
 
-  virtual void Append(const wxString& item);
-  virtual void Delete(const int n);
-  virtual void Clear(void);
-  virtual int GetSelection(void) const ;
-  virtual void SetSelection(const int n);
-  virtual int FindString(const wxString& s) const;
-  virtual wxString GetString(const int n) const ;
-  virtual void SetSize(const int x, const int y, const int width, const int height, const int sizeFlags = wxSIZE_AUTO);
-  virtual wxString GetStringSelection(void) const ;
-  virtual bool SetStringSelection(const wxString& sel);
-
-  virtual inline int Number(void) const { return no_strings; }
-  virtual void Command(wxCommandEvent& event);
-
-  virtual bool MSWCommand(const WXUINT param, const WXWORD id);
-
-  virtual inline void SetColumns(const int WXUNUSED(n) = 1 ) { /* No effect */ } ;
-  virtual inline int GetColumns(void) const { return 1 ; };
-
-  virtual WXHBRUSH OnCtlColor(const WXHDC pDC, const WXHWND pWnd, const WXUINT nCtlColor,
-                       WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
-
-  long MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
+class WXDLLEXPORT wxChoice : public wxChoiceBase
+{
+    DECLARE_DYNAMIC_CLASS(wxChoice)
+
+public:
+    // ctors
+    wxChoice() { }
+    virtual ~wxChoice();
+
+    wxChoice(wxWindow *parent,
+             wxWindowID id,
+             const wxPoint& pos = wxDefaultPosition,
+             const wxSize& size = wxDefaultSize,
+             int n = 0, const wxString choices[] = NULL,
+             long style = 0,
+             const wxValidator& validator = wxDefaultValidator,
+             const wxString& name = wxChoiceNameStr)
+    {
+        Create(parent, id, pos, size, n, choices, style, validator, name);
+    }
+
+    bool Create(wxWindow *parent,
+                wxWindowID id,
+                const wxPoint& pos = wxDefaultPosition,
+                const wxSize& size = wxDefaultSize,
+                int n = 0, const wxString choices[] = NULL,
+                long style = 0,
+                const wxValidator& validator = wxDefaultValidator,
+                const wxString& name = wxChoiceNameStr);
+
+    // implement base class pure virtuals
+    virtual int DoAppend(const wxString& item);
+    virtual void Delete(int n);
+    virtual void Clear();
+
+    virtual int GetCount() const;
+    virtual int GetSelection() const;
+    virtual void SetSelection(int n);
+
+    virtual int FindString(const wxString& s) const;
+    virtual wxString GetString(int n) const;
+    virtual void SetString(int n, const wxString& s);
+
+    // MSW only
+    virtual bool MSWCommand(WXUINT param, WXWORD id);
+    long MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
+
+protected:
+    virtual void DoSetItemClientData( int n, void* clientData );
+    virtual void* DoGetItemClientData( int n ) const;
+    virtual void DoSetItemClientObject( int n, wxClientData* clientData );
+    virtual wxClientData* DoGetItemClientObject( int n ) const;
+
+    // MSW implementation
+    virtual wxSize DoGetBestSize();
+    virtual void DoSetSize(int x, int y,
+                           int width, int height,
+                           int sizeFlags = wxSIZE_AUTO);
+
+    // free all memory we have (used by Clear() and dtor)
+    void Free();
 };
 
-#endif
-       // __CHOICEH__
+#endif // _WX_CHOICE_H_