Late note about deprecated wxDbTable constructor.

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

diff --git a/include/wx/fontdlg.h b/include/wx/fontdlg.h
index f61331e1e54885d5a9ec8eb360c679a5e328e6c5..060ab4c16159f37679002a07c671f2a2edd1ace7 100644 (file)
--- a/include/wx/fontdlg.h
+++ b/include/wx/fontdlg.h
@@ -5,8 +5,8 @@
 // Modified by:
 // Created:     12.05.02
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     12.05.02
 // RCS-ID:      $Id$

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

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


@@ -28,13 +28,14 @@ class WXDLLEXPORT wxFontDialogBase : public wxDialog
 public:
     // create the font dialog
     wxFontDialogBase() { }
 public:
     // create the font dialog
     wxFontDialogBase() { }

-    wxFontDialogBase(wxWindow *parent) { }
-    wxFontDialogBase(wxWindow *parent, const wxFontData& data) { }
+    wxFontDialogBase(wxWindow *parent) { m_parent = parent; }
+    wxFontDialogBase(wxWindow *parent, const wxFontData& data)
+        { m_parent = parent; InitFontData(&data); }

 
     bool Create(wxWindow *parent)
         { return DoCreate(parent); }
     bool Create(wxWindow *parent, const wxFontData& data)
 
     bool Create(wxWindow *parent)
         { return DoCreate(parent); }
     bool Create(wxWindow *parent, const wxFontData& data)

-        { m_fontData = data; return Create(parent); }
+        { InitFontData(&data); return Create(parent); }

 
     virtual ~wxFontDialogBase();
 
 
     virtual ~wxFontDialogBase();
 


@@ -44,31 +45,47 @@ public:
 
     // deprecated interface, for compatibility only, don't use
     wxFontDialogBase(wxWindow *parent, const wxFontData *data)
 
     // deprecated interface, for compatibility only, don't use
     wxFontDialogBase(wxWindow *parent, const wxFontData *data)

-        { Init(); Create(parent, data); }
+        { m_parent = parent; InitFontData(data); }

 
     bool Create(wxWindow *parent, const wxFontData *data)
 
     bool Create(wxWindow *parent, const wxFontData *data)

-        { if ( data ) m_fontData = *data; return Create(parent); }
+        { InitFontData(data); return Create(parent); }

 
 protected:
 
 protected:

-    virtual bool DoCreate(wxWindow *parent) { m_parent = parent; return TRUE; }
+    virtual bool DoCreate(wxWindow *parent) { m_parent = parent; return true; }
+
+    void InitFontData(const wxFontData *data = NULL)
+        { if ( data ) m_fontData = *data; }

 
     wxFontData m_fontData;
 
     wxFontData m_fontData;

+
+    DECLARE_NO_COPY_CLASS(wxFontDialogBase)

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

-#if defined(__WXUNIVERSAL__) || defined(__WXMOTIF__) || defined(__WXMAC__)
+#define USE_NATIVE_FONT_DIALOG_FOR_MACOSX 0
+
+#if defined(__WXUNIVERSAL__) || \
+    defined(__WXMOTIF__)     || \
+    (defined(__WXMAC__) && !defined(__WXMAC_OSX__))  || \
+    (defined(__WXMAC__) && !USE_NATIVE_FONT_DIALOG_FOR_MACOSX)  || \
+    (defined(__WXMAC_OSX__) && ( MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_2 ) ) || \
+    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__)
     #include "wx/gtk/fontdlg.h"
 #elif defined(__WXPM__)
     #include "wx/os2/fontdlg.h"
 #elif defined(__WXMSW__)
     #include "wx/msw/fontdlg.h"
 #elif defined(__WXGTK__)
     #include "wx/gtk/fontdlg.h"
 #elif defined(__WXPM__)
     #include "wx/os2/fontdlg.h"

+#elif defined(__WXMAC__)
+    #include "wx/mac/fontdlg.h"

 #endif
 
 // ----------------------------------------------------------------------------
 #endif
 
 // ----------------------------------------------------------------------------