wxGTK/Cygwin fix (patch 914565)

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

diff --git a/include/wx/fontdlg.h b/include/wx/fontdlg.h
index 7d3a3e8fe42cfcae1cf1ba0cf1fa3cff777d3ff4..43bc4e5ca30aced9f99a8b8f833d16336d30ff53 100644 (file)
--- a/include/wx/fontdlg.h
+++ b/include/wx/fontdlg.h
@@ -5,7 +5,7 @@
 // Modified by:
 // Created:     12.05.02
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     12.05.02
 // RCS-ID:      $Id$

-// Copyright:   (c) 1997-2002 wxWindows team
+// Copyright:   (c) 1997-2002 wxWidgets team

 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 


@@ -57,16 +57,23 @@ protected:
         { if ( data ) m_fontData = *data; }
 
     wxFontData m_fontData;
         { if ( data ) m_fontData = *data; }
 
     wxFontData m_fontData;

+
+    DECLARE_NO_COPY_CLASS(wxFontDialogBase)

 };
 
 // ----------------------------------------------------------------------------
 // platform-specific wxFontDialog implementation
 // ----------------------------------------------------------------------------
 
 };
 
 // ----------------------------------------------------------------------------
 // platform-specific wxFontDialog implementation
 // ----------------------------------------------------------------------------
 

-#if defined(__WXUNIVERSAL__) || defined(__WXMOTIF__) || defined(__WXMAC__)
+#if defined(__WXUNIVERSAL__) || \
+    defined(__WXMOTIF__)     || \
+    defined(__WXMAC__)       || \
+    defined(__WXCOCOA__)     || \
+    defined(__WXWINCE__)     || \
+    defined(__WXGPE__)
+

     #include "wx/generic/fontdlgg.h"
     #define wxFontDialog wxGenericFontDialog
     #include "wx/generic/fontdlgg.h"
     #define wxFontDialog wxGenericFontDialog

-    #define sm_classwxFontDialog sm_classwxGenericFontDialog

 #elif defined(__WXMSW__)
     #include "wx/msw/fontdlg.h"
 #elif defined(__WXGTK__)
 #elif defined(__WXMSW__)
     #include "wx/msw/fontdlg.h"
 #elif defined(__WXGTK__)