Make wxSpinCtrlGeneric usable as wxDVC editor control.

wxDVC installs temporary event handler that watches for focus changes
and some key events. Make wxSpinCtrlGeneric look like a native
wxControl in this respect even though it's actually a composite control.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67665 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/generic/spinctlg.h b/include/wx/generic/spinctlg.h
index 56eda17f9fb225908f2e25aa197470b083850b09..338dd70234a809f678a71cbaf982bc62f997bb4c 100644 (file)
--- a/include/wx/generic/spinctlg.h
+++ b/include/wx/generic/spinctlg.h
@@ -92,7 +92,7 @@ public:
 
     // forwarded events from children windows
     void OnSpinButton(wxSpinEvent& event);
 
     // forwarded events from children windows
     void OnSpinButton(wxSpinEvent& event);

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

     void OnTextChar(wxKeyEvent& event);
 
     // this window itself is used only as a container for its sub windows so it
     void OnTextChar(wxKeyEvent& event);
 
     // this window itself is used only as a container for its sub windows so it


@@ -148,6 +148,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

diff --git a/src/generic/spinctlg.cpp b/src/generic/spinctlg.cpp
index ca2a1bb465fed7b156ce7d94307cbf7f316ca870..e9a7a32a3720f1faed833d6bf91d4c207e78e6ae 100644 (file)
--- a/src/generic/spinctlg.cpp
+++ b/src/generic/spinctlg.cpp
@@ -85,13 +85,13 @@ public:
     void OnChar( wxKeyEvent &event )
     {
         if (m_spin)
     void OnChar( wxKeyEvent &event )
     {
         if (m_spin)

-            m_spin->OnTextChar(event);
+            m_spin->ProcessWindowEvent(event);

     }
 
     void OnKillFocus(wxFocusEvent& event)
     {
         if (m_spin)
     }
 
     void OnKillFocus(wxFocusEvent& event)
     {
         if (m_spin)

-            m_spin->OnTextLostFocus();
+            m_spin->ProcessWindowEvent(event);

 
         event.Skip();
     }
 
         event.Skip();
     }


@@ -357,6 +357,11 @@ void wxSpinCtrlGenericBase::DoSetToolTip(wxToolTip *tip)
 // Handle sub controls events
 // ----------------------------------------------------------------------------
 
 // Handle sub controls events
 // ----------------------------------------------------------------------------
 

+BEGIN_EVENT_TABLE(wxSpinCtrlGenericBase, wxSpinCtrlBase)
+    EVT_CHAR(wxSpinCtrlGenericBase::OnTextChar)
+    EVT_KILL_FOCUS(wxSpinCtrlGenericBase::OnTextLostFocus)
+END_EVENT_TABLE()
+

 void wxSpinCtrlGenericBase::OnSpinButton(wxSpinEvent& event)
 {
     event.Skip();
 void wxSpinCtrlGenericBase::OnSpinButton(wxSpinEvent& event)
 {
     event.Skip();


@@ -388,10 +393,12 @@ void wxSpinCtrlGenericBase::OnSpinButton(wxSpinEvent& event)
         DoSendEvent();
 }
 
         DoSendEvent();
 }
 

-void wxSpinCtrlGenericBase::OnTextLostFocus()
+void wxSpinCtrlGenericBase::OnTextLostFocus(wxFocusEvent& event)

 {
     SyncSpinToText();
     DoSendEvent();
 {
     SyncSpinToText();
     DoSendEvent();

+
+    event.Skip();

 }
 
 void wxSpinCtrlGenericBase::OnTextChar(wxKeyEvent& event)
 }
 
 void wxSpinCtrlGenericBase::OnTextChar(wxKeyEvent& event)