GetLabelTop should return the stripped label, for compatibility.

[wxWidgets.git] / src / univ / inpcons.cpp

diff --git a/src/univ/inpcons.cpp b/src/univ/inpcons.cpp
index 793efab2fe6bb38b034e81d409ffa5dfc0d49b87..7da3181e071ff90661ec23c3a1bc25c6136dc0ce 100644 (file)
--- a/src/univ/inpcons.cpp
+++ b/src/univ/inpcons.cpp
@@ -13,10 +13,6 @@
 // declarations
 // ============================================================================
 
 // declarations
 // ============================================================================
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "inpcons.h"
-#endif
-

 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------


@@ -27,6 +23,10 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#ifndef WX_PRECOMP
+    #include "wx/window.h"
+#endif // WX_PRECOMP
+

 #include "wx/univ/renderer.h"
 #include "wx/univ/inphand.h"
 #include "wx/univ/theme.h"
 #include "wx/univ/renderer.h"
 #include "wx/univ/inphand.h"
 #include "wx/univ/theme.h"


@@ -59,9 +59,15 @@ void wxInputConsumer::OnActivate(wxActivateEvent& event)
 // input processing
 // ----------------------------------------------------------------------------
 
 // input processing
 // ----------------------------------------------------------------------------
 

+wxInputHandler *
+wxInputConsumer::DoGetStdInputHandler(wxInputHandler * WXUNUSED(handlerDef))
+{
+    return NULL;
+}
+

 void wxInputConsumer::CreateInputHandler(const wxString& inphandler)
 {
 void wxInputConsumer::CreateInputHandler(const wxString& inphandler)
 {

-    m_inputHandler = wxTheme::Get()->GetInputHandler(inphandler);
+    m_inputHandler = wxTheme::Get()->GetInputHandler(inphandler, this);

 }
 
 void wxInputConsumer::OnKeyDown(wxKeyEvent& event)
 }
 
 void wxInputConsumer::OnKeyDown(wxKeyEvent& event)


@@ -106,4 +112,3 @@ bool wxInputConsumer::PerformAction(const wxControlAction& WXUNUSED(action),
 {
     return false;
 }
 {
     return false;
 }

-