avoiding crash for pure modifier events

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

diff --git a/include/wx/msw/choice.h b/include/wx/msw/choice.h
index 3d004d2ab68047ad65e31495cca2b5e90036cb4e..4f28ec07c2397fd9d481e3ff98f2f63d7021aeaa 100644 (file)
--- a/include/wx/msw/choice.h
+++ b/include/wx/msw/choice.h
@@ -16,7 +16,7 @@
 // Choice item
 // ----------------------------------------------------------------------------
 
 // Choice item
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxChoice : public wxChoiceBase
+class WXDLLIMPEXP_CORE wxChoice : public wxChoiceBase

 {
 public:
     // ctors
 {
 public:
     // ctors


@@ -66,8 +66,7 @@ public:
                 const wxValidator& validator = wxDefaultValidator,
                 const wxString& name = wxChoiceNameStr);
 
                 const wxValidator& validator = wxDefaultValidator,
                 const wxString& name = wxChoiceNameStr);
 

-    virtual void DoDeleteOneItem(unsigned int n);
-    virtual void DoClear();
+    virtual void SetLabel(const wxString& label);

 
     virtual unsigned int GetCount() const;
     virtual int GetSelection() const;
 
     virtual unsigned int GetCount() const;
     virtual int GetSelection() const;


@@ -85,10 +84,19 @@ public:
     virtual bool MSWShouldPreProcessMessage(WXMSG *pMsg);
     virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;
 
     virtual bool MSWShouldPreProcessMessage(WXMSG *pMsg);
     virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;
 

+    // returns true if the platform should explicitly apply a theme border
+    virtual bool CanApplyThemeBorder() const { return false; }
+

 protected:
 protected:

+    // choose the default border for this window
+    virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
+

     // common part of all ctors
     void Init() { m_lastAcceptedSelection = wxID_NONE; }
 
     // common part of all ctors
     void Init() { m_lastAcceptedSelection = wxID_NONE; }
 

+    virtual void DoDeleteOneItem(unsigned int n);
+    virtual void DoClear();
+

     virtual int DoInsertItems(const wxArrayStringsAdapter& items,
                               unsigned int pos,
                               void **clientData, wxClientDataType type);
     virtual int DoInsertItems(const wxArrayStringsAdapter& items,
                               unsigned int pos,
                               void **clientData, wxClientDataType type);