avoiding events during destruction, fixes #10855

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

diff --git a/include/wx/textctrl.h b/include/wx/textctrl.h
index d65e329ddaf2a358e0ac2e0c072717ec31842087..318af3e53f96206704c78d65a9930a08f992a9f3 100644 (file)
--- a/include/wx/textctrl.h
+++ b/include/wx/textctrl.h
@@ -597,7 +597,7 @@ protected:
     wxTextAttr m_defaultStyle;
 
 
     wxTextAttr m_defaultStyle;
 
 

-    DECLARE_NO_COPY_CLASS(wxTextAreaBase)
+    wxDECLARE_NO_COPY_CLASS(wxTextAreaBase);

 };
 
 // this class defines wxTextCtrl interface, wxTextCtrlBase actually implements
 };
 
 // this class defines wxTextCtrl interface, wxTextCtrlBase actually implements


@@ -612,7 +612,7 @@ public:
     wxTextCtrlIface() { }
 
 private:
     wxTextCtrlIface() { }
 
 private:

-    DECLARE_NO_COPY_CLASS(wxTextCtrlIface)
+    wxDECLARE_NO_COPY_CLASS(wxTextCtrlIface);

 };
 
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------


@@ -692,8 +692,11 @@ protected:
     virtual bool DoLoadFile(const wxString& file, int fileType);
     virtual bool DoSaveFile(const wxString& file, int fileType);
 
     virtual bool DoLoadFile(const wxString& file, int fileType);
     virtual bool DoSaveFile(const wxString& file, int fileType);
 

+private:
+    // implement the wxTextEntry pure virtual method
+    virtual wxWindow *GetEditableWindow() { return this; }

 
 

-    DECLARE_NO_COPY_CLASS(wxTextCtrlBase)
+    wxDECLARE_NO_COPY_CLASS(wxTextCtrlBase);

     DECLARE_ABSTRACT_CLASS(wxTextCtrlBase)
 };
 
     DECLARE_ABSTRACT_CLASS(wxTextCtrlBase)
 };
 


@@ -731,10 +734,10 @@ protected:
 
 class WXDLLIMPEXP_FWD_CORE wxTextUrlEvent;
 
 
 class WXDLLIMPEXP_FWD_CORE wxTextUrlEvent;
 

-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_TEXT_UPDATED, wxCommandEvent)
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_TEXT_ENTER, wxCommandEvent)
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_TEXT_URL, wxTextUrlEvent)
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_TEXT_MAXLEN, wxCommandEvent)
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_TEXT_UPDATED, wxCommandEvent);
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_TEXT_ENTER, wxCommandEvent);
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_TEXT_URL, wxTextUrlEvent);
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_TEXT_MAXLEN, wxCommandEvent);

 
 class WXDLLIMPEXP_CORE wxTextUrlEvent : public wxCommandEvent
 {
 
 class WXDLLIMPEXP_CORE wxTextUrlEvent : public wxCommandEvent
 {