projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rebake from clean wx tree.
[wxWidgets.git]
/
include
/
wx
/
msw
/
choice.h
diff --git
a/include/wx/msw/choice.h
b/include/wx/msw/choice.h
index 20d8edb5fd993ac078f00139b3ba5d2408c9472a..c5cf8125bec33d370412ffa1a8c7cce81e023332 100644
(file)
--- a/
include/wx/msw/choice.h
+++ b/
include/wx/msw/choice.h
@@
-16,7
+16,7
@@
// Choice item
// ----------------------------------------------------------------------------
// Choice item
// ----------------------------------------------------------------------------
-class WXDLL
EXPORT
wxChoice : public wxChoiceBase
+class WXDLL
IMPEXP_CORE
wxChoice : public wxChoiceBase
{
public:
// ctors
{
public:
// ctors
@@
-66,6
+66,8
@@
public:
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxChoiceNameStr);
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxChoiceNameStr);
+ virtual void SetLabel(const wxString& label);
+
virtual unsigned int GetCount() const;
virtual int GetSelection() const;
virtual int GetCurrentSelection() const;
virtual unsigned int GetCount() const;
virtual int GetSelection() const;
virtual int GetCurrentSelection() const;
@@
-75,6
+77,14
@@
public:
virtual wxString GetString(unsigned int n) const;
virtual void SetString(unsigned int n, const wxString& s);
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);
// MSW only
virtual bool MSWCommand(WXUINT param, WXWORD id);
WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
@@
-86,8
+96,15
@@
public:
virtual bool CanApplyThemeBorder() const { return false; }
protected:
virtual bool CanApplyThemeBorder() const { return false; }
protected:
+ // choose the default border for this window
+ virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
+
// common part of all ctors
// common part of all ctors
- void Init() { m_lastAcceptedSelection = wxID_NONE; }
+ void Init()
+ {
+ m_lastAcceptedSelection = wxID_NONE;
+ m_heightOwn = wxDefaultCoord;
+ }
virtual void DoDeleteOneItem(unsigned int n);
virtual void DoClear();
virtual void DoDeleteOneItem(unsigned int n);
virtual void DoClear();
@@
-109,7
+126,10
@@
protected:
// update the height of the drop down list to fit the number of items we
// have (without changing the visible height)
// update the height of the drop down list to fit the number of items we
// have (without changing the visible height)
- void UpdateVisibleHeight();
+ void MSWUpdateDropDownHeight();
+
+ // set the height of the visible part of the control to m_heightOwn
+ void MSWUpdateVisibleHeight();
// create and initialize the control
bool CreateAndInit(wxWindow *parent, wxWindowID id,
// create and initialize the control
bool CreateAndInit(wxWindow *parent, wxWindowID id,
@@
-123,12
+143,21
@@
protected:
// free all memory we have (used by Clear() and dtor)
void Free();
// 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
// last "completed" selection, i.e. not the transient one while the user is
// browsing the popup list: this is only used when != wxID_NONE which is
// the case while the drop down is opened
int m_lastAcceptedSelection;
// last "completed" selection, i.e. not the transient one while the user is
// browsing the popup list: this is only used when != wxID_NONE which is
// the case while the drop down is opened
int m_lastAcceptedSelection;
+ // the height of the control itself if it was set explicitly or
+ // wxDefaultCoord if it hadn't
+ int m_heightOwn;
DECLARE_DYNAMIC_CLASS_NO_COPY(wxChoice)
};
DECLARE_DYNAMIC_CLASS_NO_COPY(wxChoice)
};