X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/65d877d2b74ede91db174d57d8498fee5c2e3e59..173a5ddc77ceb29b7a0dba6d9feeea95ebbbd72b:/include/wx/fontdlg.h

diff --git a/include/wx/fontdlg.h b/include/wx/fontdlg.h
index 1396becad1..2c2e4d13c1 100644
--- a/include/wx/fontdlg.h
+++ b/include/wx/fontdlg.h
@@ -1,25 +1,116 @@
+///////////////////////////////////////////////////////////////////////////////
+// Name:        wx/fontdlg.h
+// Purpose:     common interface for different wxFontDialog classes
+// Author:      Vadim Zeitlin
+// Modified by:
+// Created:     12.05.02
+// RCS-ID:      $Id$
+// Copyright:   (c) 1997-2002 wxWidgets team
+// Licence:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
 #ifndef _WX_FONTDLG_H_BASE_
 #define _WX_FONTDLG_H_BASE_
 
+#include "wx/defs.h"            // for wxUSE_FONTDLG
+
 #if wxUSE_FONTDLG
 
-#if defined(__WXUNIVERSAL__) || defined(__WXMOTIF__) || defined(__WXMAC__)
-#   include "wx/generic/fontdlgg.h"
-#   define wxFontDialog wxGenericFontDialog
-#   define sm_classwxFontDialog sm_classwxGenericFontDialog
+#include "wx/dialog.h"          // the base class
+#include "wx/fontdata.h"
+
+// ----------------------------------------------------------------------------
+// wxFontDialog interface
+// ----------------------------------------------------------------------------
+
+class WXDLLIMPEXP_CORE wxFontDialogBase : public wxDialog
+{
+public:
+    // create the font dialog
+    wxFontDialogBase() { }
+    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)
+        { InitFontData(&data); return Create(parent); }
+
+    virtual ~wxFontDialogBase();
+
+    // retrieve the font data
+    const wxFontData& GetFontData() const { return m_fontData; }
+    wxFontData& GetFontData() { return m_fontData; }
+
+#if WXWIN_COMPATIBILITY_2_6
+    // deprecated interface, for compatibility only, don't use
+    wxDEPRECATED( wxFontDialogBase(wxWindow *parent, const wxFontData *data) );
+
+    wxDEPRECATED( bool Create(wxWindow *parent, const wxFontData *data) );
+#endif // WXWIN_COMPATIBILITY_2_6
+
+protected:
+    virtual bool DoCreate(wxWindow *parent) { m_parent = parent; return true; }
+
+    void InitFontData(const wxFontData *data = NULL)
+        { if ( data ) m_fontData = *data; }
+
+    wxFontData m_fontData;
+
+    wxDECLARE_NO_COPY_CLASS(wxFontDialogBase);
+};
+
+#if WXWIN_COMPATIBILITY_2_6
+    // deprecated interface, for compatibility only, don't use
+inline wxFontDialogBase::wxFontDialogBase(wxWindow *parent, const wxFontData *data)
+{ m_parent = parent; InitFontData(data); }
+
+inline bool wxFontDialogBase::Create(wxWindow *parent, const wxFontData *data)
+{ InitFontData(data); return Create(parent); }
+#endif // WXWIN_COMPATIBILITY_2_6
+
+// ----------------------------------------------------------------------------
+// platform-specific wxFontDialog implementation
+// ----------------------------------------------------------------------------
+
+#if defined( __WXOSX_MAC__ )
+//set to 1 to use native mac font and color dialogs
+#define USE_NATIVE_FONT_DIALOG_FOR_MACOSX 1
+#else
+//not supported on these platforms, leave 0
+#define USE_NATIVE_FONT_DIALOG_FOR_MACOSX 0
+#endif
+
+#if defined(__WXUNIVERSAL__) || \
+    defined(__WXMOTIF__)     || \
+    defined(__WXCOCOA__)     || \
+    defined(__WXWINCE__)     || \
+    defined(__WXGPE__)
+
+    #include "wx/generic/fontdlgg.h"
+    #define wxFontDialog wxGenericFontDialog
 #elif defined(__WXMSW__)
-#   include "wx/msw/fontdlg.h"
+    #include "wx/msw/fontdlg.h"
+#elif defined(__WXGTK20__)
+    #include "wx/gtk/fontdlg.h"
 #elif defined(__WXGTK__)
-#   include "wx/gtk/fontdlg.h"
+    #include "wx/gtk1/fontdlg.h"
 #elif defined(__WXPM__)
-#   include "wx/os2/fontdlg.h"
+    #include "wx/os2/fontdlg.h"
+#elif defined(__WXMAC__)
+    #include "wx/osx/fontdlg.h"
 #endif
 
+// ----------------------------------------------------------------------------
+// global public functions
+// ----------------------------------------------------------------------------
+
 // get the font from user and return it, returns wxNullFont if the dialog was
 // cancelled
-wxFont WXDLLEXPORT
-wxGetFontFromUser(wxWindow *parent = (wxWindow *)NULL,
-                  const wxFont& fontInit = wxNullFont);
+WXDLLIMPEXP_CORE wxFont wxGetFontFromUser(wxWindow *parent = NULL,
+                                          const wxFont& fontInit = wxNullFont,
+                                          const wxString& caption = wxEmptyString);
 
 #endif // wxUSE_FONTDLG