Define SQLUINTEGER

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

diff --git a/include/wx/msw/choice.h b/include/wx/msw/choice.h
index 15b1bb818e4808536873e2b32ae4f05ffb34b2f7..4661025fe9a5a16772e5215b72b65aab7f1e9bbd 100644 (file)
--- a/include/wx/msw/choice.h
+++ b/include/wx/msw/choice.h
@@ -24,7 +24,7 @@ class WXDLLEXPORT wxChoice : public wxChoiceBase
 {
 public:
     // ctors
 {
 public:
     // ctors

-    wxChoice() { }
+    wxChoice() { Init(); }

     virtual ~wxChoice();
 
     wxChoice(wxWindow *parent,
     virtual ~wxChoice();
 
     wxChoice(wxWindow *parent,


@@ -36,8 +36,10 @@ public:
              const wxValidator& validator = wxDefaultValidator,
              const wxString& name = wxChoiceNameStr)
     {
              const wxValidator& validator = wxDefaultValidator,
              const wxString& name = wxChoiceNameStr)
     {

+        Init();

         Create(parent, id, pos, size, n, choices, style, validator, name);
     }
         Create(parent, id, pos, size, n, choices, style, validator, name);
     }

+

     wxChoice(wxWindow *parent,
              wxWindowID id,
              const wxPoint& pos,
     wxChoice(wxWindow *parent,
              wxWindowID id,
              const wxPoint& pos,


@@ -47,6 +49,7 @@ public:
              const wxValidator& validator = wxDefaultValidator,
              const wxString& name = wxChoiceNameStr)
     {
              const wxValidator& validator = wxDefaultValidator,
              const wxString& name = wxChoiceNameStr)
     {

+        Init();

         Create(parent, id, pos, size, choices, style, validator, name);
     }
 
         Create(parent, id, pos, size, choices, style, validator, name);
     }
 


@@ -75,6 +78,9 @@ public:
 
     virtual int GetCount() const;
     virtual int GetSelection() const;
 
     virtual int GetCount() const;
     virtual int GetSelection() const;

+#if wxABI_VERSION >= 20602
+    virtual int GetCurrentSelection() const;
+#endif

     virtual void SetSelection(int n);
 
     virtual int FindString(const wxString& s) const;
     virtual void SetSelection(int n);
 
     virtual int FindString(const wxString& s) const;


@@ -84,10 +90,12 @@ public:
     // MSW only
     virtual bool MSWCommand(WXUINT param, WXWORD id);
     WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
     // 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:
 
 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;
     virtual void DoMoveWindow(int x, int y, int width, int height);
     virtual void DoSetItemClientData( int n, void* clientData );
     virtual void* DoGetItemClientData( int n ) const;


@@ -121,6 +129,13 @@ protected:
     // free all memory we have (used by Clear() and dtor)
     void Free();
 
     // 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)
 };
 
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxChoice)
 };