Added private wxMenu::MSWNewFromHMENU() method.

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

diff --git a/include/wx/msw/choice.h b/include/wx/msw/choice.h
index e069ec2a48a20a502c18b21d28b4b763698b8439..c5cf8125bec33d370412ffa1a8c7cce81e023332 100644 (file)
--- a/include/wx/msw/choice.h
+++ b/include/wx/msw/choice.h
@@ -77,6 +77,14 @@ public:
     virtual wxString GetString(unsigned int n) const;
     virtual void SetString(unsigned int n, const wxString& s);
 
+    virtual wxVisualAttributes GetDefaultAttributes() const
+    {
+        return GetClassDefaultAttributes(GetWindowVariant());
+    }
+
+    static wxVisualAttributes
+    GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
+
     // MSW only
     virtual bool MSWCommand(WXUINT param, WXWORD id);
     WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
@@ -135,6 +143,9 @@ protected:
     // free all memory we have (used by Clear() and dtor)
     void Free();
 
+    // set the height for simple combo box
+    int SetHeightSimpleComboBox(int nItems) const;
+
 #if wxUSE_DEFERRED_SIZING
     virtual void MSWEndDeferWindowPos();
 #endif // wxUSE_DEFERRED_SIZING