Added master define for CommandBar vs. PocketPC mixed bar.

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

diff --git a/include/wx/fdrepdlg.h b/include/wx/fdrepdlg.h
index 9b83c0584f6eb70867b366eb284e9cf788c7c342..9f047c2672eee25159323c7fe25e3a82ae5cbcb5 100644 (file)
--- a/include/wx/fdrepdlg.h
+++ b/include/wx/fdrepdlg.h
@@ -12,7 +12,7 @@
 #ifndef _WX_FINDREPLACEDLG_H_
 #define _WX_FINDREPLACEDLG_H_
 
 #ifndef _WX_FINDREPLACEDLG_H_
 #define _WX_FINDREPLACEDLG_H_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma interface "fdrepdlg.h"
 #endif
 
     #pragma interface "fdrepdlg.h"
 #endif
 


@@ -124,14 +124,15 @@ protected:
 
     // the last string we searched for
     wxString m_lastSearch;
 
     // the last string we searched for
     wxString m_lastSearch;

+
+    DECLARE_NO_COPY_CLASS(wxFindReplaceDialogBase)

 };
 
 // include wxFindReplaceDialog declaration
 };
 
 // include wxFindReplaceDialog declaration

-#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__)
+#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__) && !defined(__WXWINCE__)

     #include "wx/msw/fdrepdlg.h"
 #else
     #define wxGenericFindReplaceDialog wxFindReplaceDialog
     #include "wx/msw/fdrepdlg.h"
 #else
     #define wxGenericFindReplaceDialog wxFindReplaceDialog

-    #define sm_classwxGenericFindReplaceDialog sm_classwxFindReplaceDialog

 
     #include "wx/generic/fdrepdlg.h"
 #endif
 
     #include "wx/generic/fdrepdlg.h"
 #endif


@@ -161,7 +162,7 @@ public:
 private:
     wxString m_strReplace;
 
 private:
     wxString m_strReplace;
 

-    DECLARE_DYNAMIC_CLASS(wxFindDialogEvent)
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxFindDialogEvent)

 };
 
 BEGIN_DECLARE_EVENT_TYPES()
 };
 
 BEGIN_DECLARE_EVENT_TYPES()