Applied rowspan patch #15276 (dghart)

[wxWidgets.git] / include / wx / generic / fontdlgg.h

diff --git a/include/wx/generic/fontdlgg.h b/include/wx/generic/fontdlgg.h
index 485b99fdd3a1492bc9287f127162200feeeff3e5..4c9cd6e8b1f454f5e272c5454d015e5efebf89ce 100644 (file)
--- a/include/wx/generic/fontdlgg.h
+++ b/include/wx/generic/fontdlgg.h
@@ -12,15 +12,12 @@
 #ifndef _WX_GENERIC_FONTDLGG_H
 #define _WX_GENERIC_FONTDLGG_H
 
 #ifndef _WX_GENERIC_FONTDLGG_H
 #define _WX_GENERIC_FONTDLGG_H
 

-#include "wx/defs.h"

 #include "wx/gdicmn.h"
 #include "wx/font.h"
 #include "wx/gdicmn.h"
 #include "wx/font.h"

-#include "wx/dialog.h"
-#include "wx/cmndata.h"

 
 #ifdef __WXWINCE__
 #define USE_SPINCTRL_FOR_POINT_SIZE 1
 
 #ifdef __WXWINCE__
 #define USE_SPINCTRL_FOR_POINT_SIZE 1

-class WXDLLEXPORT wxSpinEvent;
+class WXDLLIMPEXP_FWD_CORE wxSpinEvent;

 #else
 #define USE_SPINCTRL_FOR_POINT_SIZE 0
 #endif
 #else
 #define USE_SPINCTRL_FOR_POINT_SIZE 0
 #endif


@@ -29,10 +26,10 @@ class WXDLLEXPORT wxSpinEvent;
  * FONT DIALOG
  */
 
  * FONT DIALOG
  */
 

-class WXDLLEXPORT wxChoice;
-class WXDLLEXPORT wxText;
-class WXDLLEXPORT wxCheckBox;
-class WXDLLEXPORT wxFontPreviewer;
+class WXDLLIMPEXP_FWD_CORE wxChoice;
+class WXDLLIMPEXP_FWD_CORE wxText;
+class WXDLLIMPEXP_FWD_CORE wxCheckBox;
+class WXDLLIMPEXP_FWD_CORE wxFontPreviewer;

 
 enum
 {
 
 enum
 {


@@ -44,10 +41,12 @@ enum
     wxID_FONT_SIZE
 };
 
     wxID_FONT_SIZE
 };
 

-class WXDLLEXPORT wxGenericFontDialog : public wxFontDialogBase
+class WXDLLIMPEXP_CORE wxGenericFontDialog : public wxFontDialogBase

 {
 public:
     wxGenericFontDialog() { Init(); }
 {
 public:
     wxGenericFontDialog() { Init(); }

+    wxGenericFontDialog(wxWindow *parent)
+        : wxFontDialogBase(parent) { Init(); }

     wxGenericFontDialog(wxWindow *parent, const wxFontData& data)
         : wxFontDialogBase(parent, data) { Init(); }
     virtual ~wxGenericFontDialog();
     wxGenericFontDialog(wxWindow *parent, const wxFontData& data)
         : wxFontDialogBase(parent, data) { Init(); }
     virtual ~wxGenericFontDialog();


@@ -102,13 +101,6 @@ private:
     DECLARE_DYNAMIC_CLASS(wxGenericFontDialog)
 };
 
     DECLARE_DYNAMIC_CLASS(wxGenericFontDialog)
 };
 

-WXDLLEXPORT const wxChar *wxFontFamilyIntToString(int family);
-WXDLLEXPORT const wxChar *wxFontWeightIntToString(int weight);
-WXDLLEXPORT const wxChar *wxFontStyleIntToString(int style);
-WXDLLEXPORT int wxFontFamilyStringToInt(wxChar *family);
-WXDLLEXPORT int wxFontWeightStringToInt(wxChar *weight);
-WXDLLEXPORT int wxFontStyleStringToInt(wxChar *style);
-

 #if WXWIN_COMPATIBILITY_2_6
     // deprecated, for backwards compatibility only
 inline wxGenericFontDialog::wxGenericFontDialog(wxWindow *parent, const wxFontData *data)
 #if WXWIN_COMPATIBILITY_2_6
     // deprecated, for backwards compatibility only
 inline wxGenericFontDialog::wxGenericFontDialog(wxWindow *parent, const wxFontData *data)