changing ES_LEFT/CENTER/RIGHT styles only works for plain (not rich) controls and...

[wxWidgets.git] / include / wx / combo.h

diff --git a/include/wx/combo.h b/include/wx/combo.h
index 886ea13a659a6fe867747d1123fc43d987eaa75c..05ee2d9c3e50790506c0707ba5edc3a9ff4c0dc0 100644 (file)
--- a/include/wx/combo.h
+++ b/include/wx/combo.h
@@ -184,6 +184,10 @@ public:
     virtual bool Enable(bool enable = true);
     virtual bool Show(bool show = true);
     virtual bool SetFont(const wxFont& font);
     virtual bool Enable(bool enable = true);
     virtual bool Show(bool show = true);
     virtual bool SetFont(const wxFont& font);

+#if wxUSE_VALIDATORS
+    virtual void SetValidator(const wxValidator &validator);
+    virtual wxValidator *GetValidator();
+#endif // wxUSE_VALIDATORS

 
     // wxTextCtrl methods - for readonly combo they should return
     // without errors.
 
     // wxTextCtrl methods - for readonly combo they should return
     // without errors.


@@ -470,6 +474,7 @@ protected:
     // event handlers
     void OnSizeEvent( wxSizeEvent& event );
     void OnFocusEvent(wxFocusEvent& event);
     // event handlers
     void OnSizeEvent( wxSizeEvent& event );
     void OnFocusEvent(wxFocusEvent& event);

+    void OnIdleEvent(wxIdleEvent& event);

     void OnTextCtrlEvent(wxCommandEvent& event);
     void OnSysColourChanged(wxSysColourChangedEvent& event);
     void OnKeyEvent(wxKeyEvent& event);
     void OnTextCtrlEvent(wxCommandEvent& event);
     void OnSysColourChanged(wxSysColourChangedEvent& event);
     void OnKeyEvent(wxKeyEvent& event);


@@ -598,6 +603,9 @@ protected:
     // is the popup window currenty shown?
     wxByte                  m_popupWinState;
 
     // is the popup window currenty shown?
     wxByte                  m_popupWinState;
 

+    // should the focus be reset to the textctrl in idle time?
+    bool                    m_resetFocus;
+    

 private:
     void Init();
 
 private:
     void Init();