Don't define __STRICT_ANSI__, we should build both with and without it.

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

diff --git a/include/wx/gtk1/fontdlg.h b/include/wx/gtk1/fontdlg.h
index 87662f028b7ba87af3a78114043d4b8b5d9a7cf8..bb82bf8d9a8bf06682f76cdb589ecd5fde24c506 100644 (file)
--- a/include/wx/gtk1/fontdlg.h
+++ b/include/wx/gtk1/fontdlg.h
@@ -1,9 +1,8 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        fontdlgg.h
+// Name:        wx/gtk1/fontdlg.h

 // Purpose:     wxFontDialog
 // Author:      Robert Roebling
 // Created:
 // Purpose:     wxFontDialog
 // Author:      Robert Roebling
 // Created:

-// RCS-ID:      $Id$

 // Copyright:   (c) Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -11,10 +10,6 @@
 #ifndef __GTK_FONTDLGH__
 #define __GTK_FONTDLGH__
 
 #ifndef __GTK_FONTDLGH__
 #define __GTK_FONTDLGH__
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "fontdlg.h"
-#endif
-

 //-----------------------------------------------------------------------------
 // wxFontDialog
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // wxFontDialog
 //-----------------------------------------------------------------------------


@@ -33,9 +28,10 @@ public:
     // implementation only
     void SetChosenFont(const char *name);
 
     // implementation only
     void SetChosenFont(const char *name);
 

+#if WXWIN_COMPATIBILITY_2_6

     // deprecated interface, don't use
     // deprecated interface, don't use

-    wxFontDialog(wxWindow *parent, const wxFontData *data)
-        : wxFontDialogBase(parent, data) { Create(parent, data); }
+    wxDEPRECATED( wxFontDialog(wxWindow *parent, const wxFontData *data) );
+#endif // WXWIN_COMPATIBILITY_2_6

 
 protected:
     // create the GTK dialog
 
 protected:
     // create the GTK dialog


@@ -45,4 +41,10 @@ private:
     DECLARE_DYNAMIC_CLASS(wxFontDialog)
 };
 
     DECLARE_DYNAMIC_CLASS(wxFontDialog)
 };
 

+#if WXWIN_COMPATIBILITY_2_6
+    // deprecated interface, don't use
+inline wxFontDialog::wxFontDialog(wxWindow *parent, const wxFontData *data)
+        : wxFontDialogBase(parent) { InitFontData(data); Create(parent); }
+#endif // WXWIN_COMPATIBILITY_2_6
+

 #endif
 #endif