Patch #826420, and also adapted to new SWIG

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

diff --git a/include/wx/msw/choice.h b/include/wx/msw/choice.h
index 654f1af915fc9723eef709817b2ac6bbf47bd876..c2b47f69c583ee2fb6134f21d4c3e353453ee18a 100644 (file)
--- a/include/wx/msw/choice.h
+++ b/include/wx/msw/choice.h
@@ -12,7 +12,7 @@
 #ifndef _WX_CHOICE_H_
 #define _WX_CHOICE_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma interface "choice.h"
 #endif
 
@@ -22,8 +22,6 @@
 
 class WXDLLEXPORT wxChoice : public wxChoiceBase
 {
-    DECLARE_DYNAMIC_CLASS(wxChoice)
-
 public:
     // ctors
     wxChoice() { }
@@ -52,6 +50,7 @@ public:
 
     // implement base class pure virtuals
     virtual int DoAppend(const wxString& item);
+    virtual int DoInsert(const wxString& item, int pos);
     virtual void Delete(int n);
     virtual void Clear();
 
@@ -66,21 +65,26 @@ public:
     // MSW only
     virtual bool MSWCommand(WXUINT param, WXWORD id);
     long MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
+    virtual WXHBRUSH OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
+            WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
 
 protected:
+    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 DoSetItemClientObject( int n, wxClientData* clientData );
     virtual wxClientData* DoGetItemClientObject( int n ) const;
 
     // MSW implementation
-    virtual wxSize DoGetBestSize();
+    virtual wxSize DoGetBestSize() const;
     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();
+
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxChoice)
 };
 
 #endif // _WX_CHOICE_H_