No real changes, just make wxWindow::CanScroll() virtual.

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

diff --git a/include/wx/gtk/fontdlg.h b/include/wx/gtk/fontdlg.h
index 9f3e37f2ecc474156c1645a0d14cd905ba307418..4c5b57a3e3fa2df0071cb22bf5e31234ef48bafb 100644 (file)
--- a/include/wx/gtk/fontdlg.h
+++ b/include/wx/gtk/fontdlg.h
@@ -1,15 +1,14 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        fontdlgg.h
+// Name:        wx/gtk/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
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef __GTK_FONTDLGH__
-#define __GTK_FONTDLGH__
+#ifndef _WX_GTK_FONTDLG_H_
+#define _WX_GTK_FONTDLG_H_

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


@@ -26,19 +25,22 @@ public:
 
     virtual ~wxFontDialog();
 
 
     virtual ~wxFontDialog();
 

-    // 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
     virtual bool DoCreate(wxWindow *parent);
 
 
 protected:
     // create the GTK dialog
     virtual bool DoCreate(wxWindow *parent);
 

-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