projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
More alignment issues
[wxWidgets.git]
/
include
/
wx
/
gtk1
/
fontdlg.h
diff --git
a/include/wx/gtk1/fontdlg.h
b/include/wx/gtk1/fontdlg.h
index df377c2510042117ab2e358946180aacebe4df33..aebdeb52d3312a6b4df73434529f6dca0e706f45 100644
(file)
--- a/
include/wx/gtk1/fontdlg.h
+++ b/
include/wx/gtk1/fontdlg.h
@@
-1,25
+1,21
@@
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-// Name: fontdlgg.h
+// Name:
wx/gtk1/
fontdlgg.h
// Purpose: wxFontDialog
// Author: Robert Roebling
// Created:
// RCS-ID: $Id$
// Copyright: (c) Robert Roebling
// Purpose: wxFontDialog
// Author: Robert Roebling
// Created:
// RCS-ID: $Id$
// Copyright: (c) Robert Roebling
-// Licence: wxWi
dget
s licence
+// Licence: wxWi
ndow
s licence
/////////////////////////////////////////////////////////////////////////////
#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
//-----------------------------------------------------------------------------
-class wxFontDialog : public wxFontDialogBase
+class
WXDLLIMPEXP_CORE
wxFontDialog : public wxFontDialogBase
{
public:
wxFontDialog() : wxFontDialogBase() { /* must be Create()d later */ }
{
public:
wxFontDialog() : wxFontDialogBase() { /* must be Create()d later */ }
@@
-33,9
+29,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
- wx
FontDialog(wxWindow *parent, const wxFontData *data)
- : wxFontDialogBase(parent, data) { Create(parent, data); }
+ wx
DEPRECATED( wxFontDialog(wxWindow *parent, const wxFontData *data) );
+#endif // WXWIN_COMPATIBILITY_2_6
protected:
// create the GTK dialog
protected:
// create the GTK dialog
@@
-45,4
+42,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