corrected wxFontData assignement operator (was recursive!)

[wxWidgets.git] / include / wx / univ / textctrl.h

diff --git a/include/wx/univ/textctrl.h b/include/wx/univ/textctrl.h
index 54f62629d7ac0cafc19db03e29a15b3c25ea2d7f..43e6d1a53bbe056cd0ba52dd8cf3ea13e5b14aa8 100644 (file)
--- a/include/wx/univ/textctrl.h
+++ b/include/wx/univ/textctrl.h
@@ -13,7 +13,7 @@
 #define _WX_UNIV_TEXTCTRL_H_
 
 #ifdef __GNUG__
 #define _WX_UNIV_TEXTCTRL_H_
 
 #ifdef __GNUG__

-    #pragma interface "textctrl.h"
+    #pragma interface "univtextctrl.h"

 #endif
 
 class WXDLLEXPORT wxCaret;
 #endif
 
 class WXDLLEXPORT wxCaret;


@@ -562,14 +562,14 @@ class WXDLLEXPORT wxStdTextCtrlInputHandler : public wxStdInputHandler
 public:
     wxStdTextCtrlInputHandler(wxInputHandler *inphand);
 
 public:
     wxStdTextCtrlInputHandler(wxInputHandler *inphand);
 

-    virtual bool HandleKey(wxControl *control,
+    virtual bool HandleKey(wxInputConsumer *consumer,

                            const wxKeyEvent& event,
                            bool pressed);
                            const wxKeyEvent& event,
                            bool pressed);

-    virtual bool HandleMouse(wxControl *control,
+    virtual bool HandleMouse(wxInputConsumer *consumer,

                              const wxMouseEvent& event);
                              const wxMouseEvent& event);

-    virtual bool HandleMouseMove(wxControl *control,
+    virtual bool HandleMouseMove(wxInputConsumer *consumer,

                                  const wxMouseEvent& event);
                                  const wxMouseEvent& event);

-    virtual bool HandleFocus(wxControl *control, const wxFocusEvent& event);
+    virtual bool HandleFocus(wxInputConsumer *consumer, const wxFocusEvent& event);

 
 protected:
     // get the position of the mouse click
 
 protected:
     // get the position of the mouse click