reverted Julians changes to the pragmas

[wxWidgets.git] / src / gtk1 / textctrl.cpp

diff --git a/src/gtk1/textctrl.cpp b/src/gtk1/textctrl.cpp
index bde02f7faabc5879731819b02ec65894910b412b..65f795181320acfd6733c45b150126fe96a46394 100644 (file)
--- a/src/gtk1/textctrl.cpp
+++ b/src/gtk1/textctrl.cpp
@@ -80,7 +80,6 @@ gtk_scrollbar_changed_callback( GtkWidget *WXUNUSED(widget), wxTextCtrl *win )
 // "focus_in_event"
 //-----------------------------------------------------------------------------
 
 // "focus_in_event"
 //-----------------------------------------------------------------------------
 

-wxWindow *FindFocusedChild(wxWindow *win);

 extern wxWindow  *g_focusWindow;
 extern bool       g_blockEventsOnDrag;
 // extern bool g_isIdle;
 extern wxWindow  *g_focusWindow;
 extern bool       g_blockEventsOnDrag;
 // extern bool g_isIdle;


@@ -152,7 +151,7 @@ static gint gtk_text_focus_out_callback( GtkWidget *widget, GdkEvent *WXUNUSED(e
     g_sendActivateEvent = 0;
 #endif
 
     g_sendActivateEvent = 0;
 #endif
 

-    wxWindow *winFocus = FindFocusedChild(win);
+    wxWindow *winFocus = wxFindFocusedChild(win);

     if ( winFocus )
         win = winFocus;
 
     if ( winFocus )
         win = winFocus;
 


@@ -926,27 +925,6 @@ void wxTextCtrl::Paste()
 #endif
 }
 
 #endif
 }
 

-bool wxTextCtrl::CanCopy() const
-{
-    // Can copy if there's a selection
-    long from, to;
-    GetSelection(& from, & to);
-    return (from != to) ;
-}
-
-bool wxTextCtrl::CanCut() const
-{
-    // Can cut if there's a selection
-    long from, to;
-    GetSelection(& from, & to);
-    return (from != to) && (IsEditable());
-}
-
-bool wxTextCtrl::CanPaste() const
-{
-    return IsEditable() ;
-}
-

 // Undo/redo
 void wxTextCtrl::Undo()
 {
 // Undo/redo
 void wxTextCtrl::Undo()
 {