Take into account wxFONTFLAG_STRIKETHROUGH in wxGTK wxFont ctor.

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

diff --git a/include/wx/msw/choice.h b/include/wx/msw/choice.h
index e069ec2a48a20a502c18b21d28b4b763698b8439..d17e1c655d03907037455e291360df9db8b18de2 100644 (file)
--- a/include/wx/msw/choice.h
+++ b/include/wx/msw/choice.h
@@ -66,6 +66,8 @@ public:
                 const wxValidator& validator = wxDefaultValidator,
                 const wxString& name = wxChoiceNameStr);
 
+    virtual bool Show(bool show = true);
+
     virtual void SetLabel(const wxString& label);
 
     virtual unsigned int GetCount() const;
@@ -77,6 +79,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);
@@ -116,6 +126,9 @@ protected:
                            int width, int height,
                            int sizeFlags = wxSIZE_AUTO);
 
+    // Show or hide the popup part of the control.
+    void MSWDoPopupOrDismiss(bool show);
+
     // update the height of the drop down list to fit the number of items we
     // have (without changing the visible height)
     void MSWUpdateDropDownHeight();
@@ -135,6 +148,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