m_font may not have been set yet. Default to letting GetTextExtent

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

diff --git a/src/univ/inphand.cpp b/src/univ/inphand.cpp
index 0e8949d2ded70bba77ebbae036079f528f41a17b..73357762fb3abb9943dfe9e843a6fd19435c28df 100644 (file)
--- a/src/univ/inphand.cpp
+++ b/src/univ/inphand.cpp
@@ -5,8 +5,8 @@
 // Modified by:
 // Created:     18.08.00
 // RCS-ID:      $Id$
-// Copyright:   (c) 2000 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows license
+// Copyright:   (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)
+// Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ===========================================================================
@@ -17,7 +17,7 @@
 // headers
 // ---------------------------------------------------------------------------
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma implementation "inphand.h"
 #endif
 
@@ -41,19 +41,19 @@
 // wxInputHandler
 // ----------------------------------------------------------------------------
 
-bool wxInputHandler::HandleMouseMove(wxControl * WXUNUSED(control),
+bool wxInputHandler::HandleMouseMove(wxInputConsumer * WXUNUSED(consumer),
                                      const wxMouseEvent& WXUNUSED(event))
 {
     return FALSE;
 }
 
-bool wxInputHandler::HandleFocus(wxControl *WXUNUSED(control),
+bool wxInputHandler::HandleFocus(wxInputConsumer *WXUNUSED(consumer),
                                  const wxFocusEvent& WXUNUSED(event))
 {
     return FALSE;
 }
 
-bool wxInputHandler::HandleActivation(wxControl *WXUNUSED(control),
+bool wxInputHandler::HandleActivation(wxInputConsumer *WXUNUSED(consumer),
                                       bool WXUNUSED(activated))
 {
     return FALSE;