X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8db37e069996bf60cbc152eb8d93b199e7c80842..eaefbb887c448d837b97857a097426e591bbc1d0:/include/wx/fdrepdlg.h

diff --git a/include/wx/fdrepdlg.h b/include/wx/fdrepdlg.h
index 9b83c0584f..f8d30441f0 100644
--- a/include/wx/fdrepdlg.h
+++ b/include/wx/fdrepdlg.h
@@ -12,7 +12,7 @@
 #ifndef _WX_FINDREPLACEDLG_H_
 #define _WX_FINDREPLACEDLG_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma interface "fdrepdlg.h"
 #endif
 
@@ -124,14 +124,15 @@ protected:
 
     // the last string we searched for
     wxString m_lastSearch;
+
+    DECLARE_NO_COPY_CLASS(wxFindReplaceDialogBase)
 };
 
 // include wxFindReplaceDialog declaration
-#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__)
+#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__) && !defined(__WXWINCE__)
     #include "wx/msw/fdrepdlg.h"
 #else
     #define wxGenericFindReplaceDialog wxFindReplaceDialog
-    #define sm_classwxGenericFindReplaceDialog sm_classwxFindReplaceDialog
 
     #include "wx/generic/fdrepdlg.h"
 #endif
@@ -161,7 +162,7 @@ public:
 private:
     wxString m_strReplace;
 
-    DECLARE_DYNAMIC_CLASS(wxFindDialogEvent)
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxFindDialogEvent)
 };
 
 BEGIN_DECLARE_EVENT_TYPES()
@@ -176,7 +177,7 @@ typedef void (wxEvtHandler::*wxFindDialogEventFunction)(wxFindDialogEvent&);
 
 #define EVT_FIND(id, fn) \
     DECLARE_EVENT_TABLE_ENTRY( \
-        wxEVT_COMMAND_FIND, id, -1, \
+        wxEVT_COMMAND_FIND, id, wxID_ANY, \
         (wxObjectEventFunction)(wxEventFunction)(wxFindDialogEventFunction) \
         & fn, \
         (wxObject *) NULL \
@@ -184,7 +185,7 @@ typedef void (wxEvtHandler::*wxFindDialogEventFunction)(wxFindDialogEvent&);
 
 #define EVT_FIND_NEXT(id, fn) \
     DECLARE_EVENT_TABLE_ENTRY( \
-        wxEVT_COMMAND_FIND_NEXT, id, -1, \
+        wxEVT_COMMAND_FIND_NEXT, id, wxID_ANY, \
         (wxObjectEventFunction)(wxEventFunction)(wxFindDialogEventFunction) \
         & fn, \
         (wxObject *) NULL \
@@ -192,7 +193,7 @@ typedef void (wxEvtHandler::*wxFindDialogEventFunction)(wxFindDialogEvent&);
 
 #define EVT_FIND_REPLACE(id, fn) \
     DECLARE_EVENT_TABLE_ENTRY( \
-        wxEVT_COMMAND_FIND_REPLACE, id, -1, \
+        wxEVT_COMMAND_FIND_REPLACE, id, wxID_ANY, \
         (wxObjectEventFunction)(wxEventFunction)(wxFindDialogEventFunction) \
         & fn, \
         (wxObject *) NULL \
@@ -200,7 +201,7 @@ typedef void (wxEvtHandler::*wxFindDialogEventFunction)(wxFindDialogEvent&);
 
 #define EVT_FIND_REPLACE_ALL(id, fn) \
     DECLARE_EVENT_TABLE_ENTRY( \
-        wxEVT_COMMAND_FIND_REPLACE_ALL, id, -1, \
+        wxEVT_COMMAND_FIND_REPLACE_ALL, id, wxID_ANY, \
         (wxObjectEventFunction)(wxEventFunction)(wxFindDialogEventFunction) \
         & fn, \
         (wxObject *) NULL \
@@ -208,7 +209,7 @@ typedef void (wxEvtHandler::*wxFindDialogEventFunction)(wxFindDialogEvent&);
 
 #define EVT_FIND_CLOSE(id, fn) \
     DECLARE_EVENT_TABLE_ENTRY( \
-        wxEVT_COMMAND_FIND_CLOSE, id, -1, \
+        wxEVT_COMMAND_FIND_CLOSE, id, wxID_ANY, \
         (wxObjectEventFunction)(wxEventFunction)(wxFindDialogEventFunction) \
         & fn, \
         (wxObject *) NULL \