OS X savvy implementation

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

diff --git a/include/wx/msw/choice.h b/include/wx/msw/choice.h
index d02f98dcd81646447675a2f15cf98d05dfe93f6a..5348fd5e26e067c1a42f65e749c7cf1be292bd6a 100644 (file)
--- a/include/wx/msw/choice.h
+++ b/include/wx/msw/choice.h
@@ -83,9 +83,8 @@ public:
 
     // MSW only
     virtual bool MSWCommand(WXUINT param, WXWORD id);
 
     // 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);
+    WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
+    virtual WXHBRUSH MSWControlColor(WXHDC hDC);

 
 protected:
     virtual void DoMoveWindow(int x, int y, int width, int height);
 
 protected:
     virtual void DoMoveWindow(int x, int y, int width, int height);


@@ -101,6 +100,8 @@ protected:
                            int width, int height,
                            int sizeFlags = wxSIZE_AUTO);
 
                            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
     virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;
 
     // update the height of the drop down list to fit the number of items we