Add wxComboBox-compatible Popup() and Dismiss() functions in wxComboCtrl

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

diff --git a/include/wx/msw/toplevel.h b/include/wx/msw/toplevel.h
index e1681e056846fb4358c977c3b4000fb71d74b4cb..52905cc32a5e831555331c51165578546f51bc5c 100644 (file)
--- a/include/wx/msw/toplevel.h
+++ b/include/wx/msw/toplevel.h
@@ -64,6 +64,7 @@ public:
 
     virtual bool Show(bool show = true);
 
+    virtual void ShowWithoutActivating();
     virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL);
     virtual bool IsFullScreen() const { return m_fsIsShowing; }
 
@@ -140,10 +141,19 @@ protected:
     virtual void DoFreeze();
     virtual void DoThaw();
 
+    virtual void DoEnable(bool enable);
+
     // helper of SetIcons(): calls gets the icon with the size specified by the
     // given system metrics (SM_C{X|Y}[SM]ICON) from the bundle and sets it
-    // using WM_SETICON with the specified wParam (ICOM_SMALL or ICON_BIG)
-    void DoSelectAndSetIcon(const wxIconBundle& icons, int smX, int smY, int i);
+    // using WM_SETICON with the specified wParam (ICOM_SMALL or ICON_BIG);
+    // returns true if the icon was set
+    bool DoSelectAndSetIcon(const wxIconBundle& icons, int smX, int smY, int i);
+
+    // override wxWindow virtual method to use CW_USEDEFAULT if necessary
+    virtual void MSWGetCreateWindowCoords(const wxPoint& pos,
+                                          const wxSize& size,
+                                          int& x, int& y,
+                                          int& w, int& h) const;
 
 
     // is the window currently iconized?
@@ -205,7 +215,7 @@ private:
 #endif
 
     DECLARE_EVENT_TABLE()
-    DECLARE_NO_COPY_CLASS(wxTopLevelWindowMSW)
+    wxDECLARE_NO_COPY_CLASS(wxTopLevelWindowMSW);
 };
 
 #endif // _WX_MSW_TOPLEVEL_H_