Further wxUniv fixes

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

diff --git a/include/wx/msw/choice.h b/include/wx/msw/choice.h
index c098da4a0b6a4e346df1adcadf1b3037be4f8a7c..fdc9fef5b89486be739b20527f0cb60676b72625 100644 (file)
--- a/include/wx/msw/choice.h
+++ b/include/wx/msw/choice.h
@@ -27,6 +27,7 @@ class WXDLLEXPORT wxChoice : public wxChoiceBase
 public:
     // ctors
     wxChoice() { }
 public:
     // ctors
     wxChoice() { }

+    virtual ~wxChoice();

 
     wxChoice(wxWindow *parent,
              wxWindowID id,
 
     wxChoice(wxWindow *parent,
              wxWindowID id,


@@ -65,18 +66,24 @@ public:
     // MSW only
     virtual bool MSWCommand(WXUINT param, WXWORD id);
     long MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
     // 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:
 
 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 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);
     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 // _WX_CHOICE_H_
 };
 
 #endif // _WX_CHOICE_H_