added wx/object.h include (bug 1398517)

[wxWidgets.git] / include / wx / msw / wince / choicece.h

diff --git a/include/wx/msw/wince/choicece.h b/include/wx/msw/wince/choicece.h
index bb893609f3150e509dc78cc78144eee7fc4d8321..e7f6781e6015895d398f0e0cc8e25b4f507d3ca9 100644 (file)
--- a/include/wx/msw/wince/choicece.h
+++ b/include/wx/msw/wince/choicece.h
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////
 // Name:        wx/msw/wince/choicece.h
 ///////////////////////////////////////////////////////////////////////////////
 // Name:        wx/msw/wince/choicece.h

-// Purpose:     wxChoice implementation for Smartphones
+// Purpose:     wxChoice implementation for smart phones driven by WinCE

 // Author:      Wlodzimierz ABX Skiba
 // Modified by:
 // Created:     29.07.2004
 // Author:      Wlodzimierz ABX Skiba
 // Modified by:
 // Created:     29.07.2004


@@ -16,10 +16,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "choicece.h"
-#endif
-

 #include "wx/defs.h"
 
 #if wxUSE_CHOICE
 #include "wx/defs.h"
 
 #if wxUSE_CHOICE


@@ -91,13 +87,18 @@ public:
     virtual int GetSelection() const;
     virtual void SetSelection(int n);
 
     virtual int GetSelection() const;
     virtual void SetSelection(int n);
 

-    virtual int FindString(const wxString& s) const;
+    virtual int FindString(const wxString& s, bool bCase = false) const;

     virtual wxString GetString(int n) const;
     virtual void SetString(int n, const wxString& s);
 
     // get the subclassed window proc of the buddy list of choices
     WXFARPROC GetBuddyWndProc() const { return m_wndProcBuddy; }
 
     virtual wxString GetString(int n) const;
     virtual void SetString(int n, const wxString& s);
 
     // get the subclassed window proc of the buddy list of choices
     WXFARPROC GetBuddyWndProc() const { return m_wndProcBuddy; }
 

+    // return the choice object whose buddy is the given window or NULL
+    static wxChoice *GetChoiceForListBox(WXHWND hwndBuddy);
+
+    virtual bool MSWCommand(WXUINT param, WXWORD id);
+

 protected:
     virtual void DoSetItemClientData( int n, void* clientData );
     virtual void* DoGetItemClientData( int n ) const;
 protected:
     virtual void DoSetItemClientData( int n, void* clientData );
     virtual void* DoGetItemClientData( int n ) const;