No changes, just move time functions from wx/stopwatch.h to wx/time.h.

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

diff --git a/include/wx/fontdlg.h b/include/wx/fontdlg.h
index dfeacdc4d79b5a859afc7944d677119d98e9ce53..2c2e4d13c112fd44051efd8d32b4fa9706400ba4 100644 (file)
--- a/include/wx/fontdlg.h
+++ b/include/wx/fontdlg.h
@@ -17,7 +17,7 @@
 #if wxUSE_FONTDLG
 
 #include "wx/dialog.h"          // the base class
 #if wxUSE_FONTDLG
 
 #include "wx/dialog.h"          // the base class

-#include "wx/cmndata.h"         // wxFontData
+#include "wx/fontdata.h"

 
 // ----------------------------------------------------------------------------
 // wxFontDialog interface
 
 // ----------------------------------------------------------------------------
 // wxFontDialog interface


@@ -58,7 +58,7 @@ protected:
 
     wxFontData m_fontData;
 
 
     wxFontData m_fontData;
 

-    DECLARE_NO_COPY_CLASS(wxFontDialogBase)
+    wxDECLARE_NO_COPY_CLASS(wxFontDialogBase);

 };
 
 #if WXWIN_COMPATIBILITY_2_6
 };
 
 #if WXWIN_COMPATIBILITY_2_6


@@ -74,7 +74,7 @@ inline bool wxFontDialogBase::Create(wxWindow *parent, const wxFontData *data)
 // platform-specific wxFontDialog implementation
 // ----------------------------------------------------------------------------
 
 // platform-specific wxFontDialog implementation
 // ----------------------------------------------------------------------------
 

-#if defined( __WXMAC_OSX__ )
+#if defined( __WXOSX_MAC__ )

 //set to 1 to use native mac font and color dialogs
 #define USE_NATIVE_FONT_DIALOG_FOR_MACOSX 1
 #else
 //set to 1 to use native mac font and color dialogs
 #define USE_NATIVE_FONT_DIALOG_FOR_MACOSX 1
 #else


@@ -99,7 +99,7 @@ inline bool wxFontDialogBase::Create(wxWindow *parent, const wxFontData *data)
 #elif defined(__WXPM__)
     #include "wx/os2/fontdlg.h"
 #elif defined(__WXMAC__)
 #elif defined(__WXPM__)
     #include "wx/os2/fontdlg.h"
 #elif defined(__WXMAC__)

-    #include "wx/mac/fontdlg.h"
+    #include "wx/osx/fontdlg.h"

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


@@ -108,7 +108,7 @@ inline bool wxFontDialogBase::Create(wxWindow *parent, const wxFontData *data)
 
 // get the font from user and return it, returns wxNullFont if the dialog was
 // cancelled
 
 // get the font from user and return it, returns wxNullFont if the dialog was
 // cancelled

-WXDLLIMPEXP_CORE wxFont wxGetFontFromUser(wxWindow *parent = (wxWindow *)NULL,
+WXDLLIMPEXP_CORE wxFont wxGetFontFromUser(wxWindow *parent = NULL,

                                           const wxFont& fontInit = wxNullFont,
                                           const wxString& caption = wxEmptyString);
 
                                           const wxFont& fontInit = wxNullFont,
                                           const wxString& caption = wxEmptyString);