glcanvas fix and toplevel event handler exposed

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

diff --git a/include/wx/fontdlg.h b/include/wx/fontdlg.h
index d8b44cc69fee100c93a34b945809230573053a51..421716d76178009673531ee38679f2d46770a997 100644 (file)
--- a/include/wx/fontdlg.h
+++ b/include/wx/fontdlg.h
@@ -6,7 +6,7 @@
 // Created:     12.05.02
 // RCS-ID:      $Id$
 // Copyright:   (c) 1997-2002 wxWindows team
 // Created:     12.05.02
 // RCS-ID:      $Id$
 // Copyright:   (c) 1997-2002 wxWindows team

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_FONTDLG_H_BASE_
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_FONTDLG_H_BASE_


@@ -57,16 +57,18 @@ 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__)