compilation fix for WXWIN_COMPATIBILITY_2 == 1

[wxWidgets.git] / src / msw / fontdlg.cpp

diff --git a/src/msw/fontdlg.cpp b/src/msw/fontdlg.cpp
index b15e0adcbd72b207927aa334ed1fed20715fb142..fdcbccd218581b2df4275edbcd723808184795ea 100644 (file)
--- a/src/msw/fontdlg.cpp
+++ b/src/msw/fontdlg.cpp
@@ -38,8 +38,9 @@
 
 #include "wx/fontdlg.h"
 
-#if !defined(__WIN32__) || defined(__SALFORDC__) || defined(__WXWINE__)
-    #include <commdlg.h>
+#if !defined(__WIN32__) || defined(__SALFORDC__)
+#include <windows.h>
+#include <commdlg.h>
 #endif
 
 #include "wx/msw/private.h"
@@ -64,27 +65,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxFontDialog, wxDialog)
 // wxFontDialog
 // ----------------------------------------------------------------------------
 
-wxFontDialog::wxFontDialog()
-{
-    m_parent = NULL;
-}
-
-wxFontDialog::wxFontDialog(wxWindow *parent, wxFontData *data)
-{
-    Create(parent, data);
-}
-
-bool wxFontDialog::Create(wxWindow *parent, wxFontData *data)
-{
-    m_parent = parent;
-
-    wxCHECK_MSG( data, FALSE, _T("no font data in wxFontDialog") );
-
-    m_fontData = *data;
-
-    return TRUE;
-}
-
 int wxFontDialog::ShowModal()
 {
     DWORD flags = CF_SCREENFONTS | CF_NOSIMULATIONS;