Add wxToolBarToolBase, missing flags, etc.

[wxWidgets.git] / include / wx / generic / spinctlg.h

diff --git a/include/wx/generic/spinctlg.h b/include/wx/generic/spinctlg.h
index 9d8fe791c5ab1d025b504a0e57bed5bddf8538e8..a8dad8de5c8bf0797f2403a58e3e9ec16783f3d4 100644 (file)
--- a/include/wx/generic/spinctlg.h
+++ b/include/wx/generic/spinctlg.h
@@ -81,7 +81,9 @@ public:
     // forward these functions to all subcontrols
     virtual bool Enable(bool enable = true);
     virtual bool Show(bool show = true);
     // forward these functions to all subcontrols
     virtual bool Enable(bool enable = true);
     virtual bool Show(bool show = true);

-    virtual bool Reparent(wxWindowBase *newParent);
+#if wxUSE_TOOLTIPS
+    virtual void DoSetToolTip(wxToolTip *tip);
+#endif // wxUSE_TOOLTIPS

 
     // get the subcontrols
     wxTextCtrl   *GetText() const       { return m_textCtrl; }
 
     // get the subcontrols
     wxTextCtrl   *GetText() const       { return m_textCtrl; }


@@ -89,9 +91,15 @@ public:
 
     // forwarded events from children windows
     void OnSpinButton(wxSpinEvent& event);
 
     // forwarded events from children windows
     void OnSpinButton(wxSpinEvent& event);

-    void OnTextEnter(wxCommandEvent& event);
+    void OnTextLostFocus(wxFocusEvent& event);

     void OnTextChar(wxKeyEvent& event);
 
     void OnTextChar(wxKeyEvent& event);
 

+    // this window itself is used only as a container for its sub windows so it
+    // shouldn't accept the focus at all and any attempts to explicitly set
+    // focus to it should give focus to its text constol part
+    virtual bool AcceptsFocus() const { return false; }
+    virtual void SetFocus();
+

     friend class wxSpinCtrlTextGeneric;
 
 protected:
     friend class wxSpinCtrlTextGeneric;
 
 protected:


@@ -99,6 +107,11 @@ protected:
     virtual wxSize DoGetBestSize() const;
     virtual void DoMoveWindow(int x, int y, int width, int height);
 
     virtual wxSize DoGetBestSize() const;
     virtual void DoMoveWindow(int x, int y, int width, int height);
 

+#ifdef __WXMSW__
+    // and, for MSW, enabling this window itself
+    virtual void DoEnable(bool enable);
+#endif // __WXMSW__
+

     // generic double valued functions
     double DoGetValue() const { return m_value; }
     bool DoSetValue(double val);
     // generic double valued functions
     double DoGetValue() const { return m_value; }
     bool DoSetValue(double val);


@@ -139,6 +152,8 @@ protected:
 private:
     // common part of all ctors
     void Init();
 private:
     // common part of all ctors
     void Init();

+
+    DECLARE_EVENT_TABLE()

 };
 
 #else // !wxUSE_SPINBTN
 };
 
 #else // !wxUSE_SPINBTN