don't use deprecated cast operator to wxList&

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

diff --git a/include/wx/msw/choice.h b/include/wx/msw/choice.h
index 690b16860518e690fb62655b98fbb85f4aa3865b..f9d2058492367a6ae86599874247600fb34a8cab 100644 (file)
--- a/include/wx/msw/choice.h
+++ b/include/wx/msw/choice.h
@@ -12,10 +12,6 @@
 #ifndef _WX_CHOICE_H_
 #define _WX_CHOICE_H_
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "choice.h"
-#endif
-
 // ----------------------------------------------------------------------------
 // Choice item
 // ----------------------------------------------------------------------------
@@ -24,7 +20,7 @@ class WXDLLEXPORT wxChoice : public wxChoiceBase
 {
 public:
     // ctors
-    wxChoice() { }
+    wxChoice() { Init(); }
     virtual ~wxChoice();
 
     wxChoice(wxWindow *parent,
@@ -36,8 +32,10 @@ public:
              const wxValidator& validator = wxDefaultValidator,
              const wxString& name = wxChoiceNameStr)
     {
+        Init();
         Create(parent, id, pos, size, n, choices, style, validator, name);
     }
+
     wxChoice(wxWindow *parent,
              wxWindowID id,
              const wxPoint& pos,
@@ -47,6 +45,7 @@ public:
              const wxValidator& validator = wxDefaultValidator,
              const wxString& name = wxChoiceNameStr)
     {
+        Init();
         Create(parent, id, pos, size, choices, style, validator, name);
     }
 
@@ -75,6 +74,7 @@ public:
 
     virtual int GetCount() const;
     virtual int GetSelection() const;
+    virtual int GetCurrentSelection() const;
     virtual void SetSelection(int n);
 
     virtual int FindString(const wxString& s) const;
@@ -84,10 +84,12 @@ public:
     // MSW only
     virtual bool MSWCommand(WXUINT param, WXWORD id);
     WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
-    virtual WXHBRUSH OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
-            WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
+    virtual WXHBRUSH MSWControlColor(WXHDC hDC, WXHWND hWnd);
 
 protected:
+    // common part of all ctors
+    void Init() { m_lastAcceptedSelection = wxID_NONE; }
+
     virtual void DoMoveWindow(int x, int y, int width, int height);
     virtual void DoSetItemClientData( int n, void* clientData );
     virtual void* DoGetItemClientData( int n ) const;
@@ -101,6 +103,8 @@ protected:
                            int width, int height,
                            int sizeFlags = wxSIZE_AUTO);
 
+    virtual bool MSWShouldPreProcessMessage(WXMSG *pMsg);
+
     virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;
 
     // update the height of the drop down list to fit the number of items we
@@ -119,6 +123,13 @@ protected:
     // free all memory we have (used by Clear() and dtor)
     void Free();
 
+
+    // last "completed" selection, i.e. not the transient one while the user is
+    // browsing the popup list: this is only used when != wxID_NONE which is
+    // the case while the drop down is opened
+    int m_lastAcceptedSelection;
+
+
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxChoice)
 };