applied patch fixing problems with X server crash when using wxGLCanvas with nVidia...

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

diff --git a/include/wx/generic/fontdlgg.h b/include/wx/generic/fontdlgg.h
index 6bb9b29fa7e4d7869802bf3880b70a19ea831456..f15539ddef717a733cd5b058073f66fb10711ca5 100644 (file)
--- a/include/wx/generic/fontdlgg.h
+++ b/include/wx/generic/fontdlgg.h
@@ -1,18 +1,18 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        fontdlgg.h
+// Name:        wx/generic/fontdlgg.h
 // Purpose:     wxGenericFontDialog
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c)
-// Licence:    wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef __FONTDLGH_G__
-#define __FONTDLGH_G__
+#ifndef _WX_GENERIC_FONTDLGG_H
+#define _WX_GENERIC_FONTDLGG_H
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma interface "fontdlgg.h"
 #endif
 
@@ -25,71 +25,73 @@
 /*
  * FONT DIALOG
  */
- 
+
 class WXDLLEXPORT wxChoice;
 class WXDLLEXPORT wxText;
 class WXDLLEXPORT wxCheckBox;
+class WXDLLEXPORT wxFontPreviewer;
 
-#define wxID_FONT_UNDERLINE 3000
-#define wxID_FONT_STYLE     3001
-#define wxID_FONT_WEIGHT    3002
-#define wxID_FONT_FAMILY    3003
-#define wxID_FONT_COLOUR    3004
-#define wxID_FONT_SIZE      3005
+enum
+{
+    wxID_FONT_UNDERLINE = 3000,
+    wxID_FONT_STYLE,
+    wxID_FONT_WEIGHT,
+    wxID_FONT_FAMILY,
+    wxID_FONT_COLOUR,
+    wxID_FONT_SIZE
+};
 
-class WXDLLEXPORT wxGenericFontDialog: public wxDialog
+class WXDLLEXPORT wxGenericFontDialog : public wxFontDialogBase
 {
- DECLARE_DYNAMIC_CLASS(wxGenericFontDialog)
- protected:
-  wxFontData fontData;
-  wxFont dialogFont;
-  wxWindow *dialogParent;
+public:
+    wxGenericFontDialog() { Init(); }
+    wxGenericFontDialog(wxWindow *parent, const wxFontData& data)
+        : wxFontDialogBase(parent, data) { Init(); }
+    virtual ~wxGenericFontDialog();
 
-  // Area reserved for font display
-  wxRect fontRect;
+    virtual int ShowModal();
 
-  wxChoice *familyChoice;
-  wxChoice *styleChoice;
-  wxChoice *weightChoice;
-  wxChoice *colourChoice;
-  wxCheckBox *underLineCheckBox;
-  wxChoice   *pointSizeChoice;
-  bool       m_useEvents;
+    // deprecated, for backwards compatibility only
+    wxGenericFontDialog(wxWindow *parent, const wxFontData *data)
+        : wxFontDialogBase(parent, data) { Init(); }
 
-//  static bool fontDialogCancelled;
- public:
- 
-  wxGenericFontDialog(void);
-  wxGenericFontDialog(wxWindow *parent, wxFontData *data = (wxFontData *) NULL);
-  ~wxGenericFontDialog(void);
+    // Internal functions
+    void OnCloseWindow(wxCloseEvent& event);
 
-  bool Create(wxWindow *parent, wxFontData *data = (wxFontData *) NULL);
+    virtual void CreateWidgets();
+    virtual void InitializeFont();
 
-  int ShowModal(void);
+    void OnChangeFont(wxCommandEvent& event);
 
-  inline wxFontData& GetFontData(void) { return fontData; }
+protected:
+    // common part of all ctors
+    void Init();
 
-  // Internal functions
-  void OnPaint(wxPaintEvent& event);
+    virtual bool DoCreate(wxWindow *parent);
 
-  bool OnClose(void);
+    wxFont dialogFont;
 
-  virtual void CreateWidgets(void);
-  virtual void InitializeFont(void);
-  
-  virtual void PaintFontBackground(wxDC& dc);
-  virtual void PaintFont(wxDC& dc);
+    wxChoice *familyChoice;
+    wxChoice *styleChoice;
+    wxChoice *weightChoice;
+    wxChoice *colourChoice;
+    wxCheckBox *underLineCheckBox;
+    wxChoice   *pointSizeChoice;
 
-  void OnChangeFont(wxCommandEvent& event);
+    wxFontPreviewer *m_previewer;
+    bool       m_useEvents;
 
-DECLARE_EVENT_TABLE()
+    //  static bool fontDialogCancelled;
+    DECLARE_EVENT_TABLE()
+    DECLARE_DYNAMIC_CLASS(wxGenericFontDialog)
 };
 
-char* WXDLLEXPORT wxFontFamilyIntToString(int family);
-char* WXDLLEXPORT wxFontWeightIntToString(int weight);
-char* WXDLLEXPORT wxFontStyleIntToString(int style);
-int WXDLLEXPORT wxFontFamilyStringToInt(char *family);
-int WXDLLEXPORT wxFontWeightStringToInt(char *weight);
-int WXDLLEXPORT wxFontStyleStringToInt(char *style);
+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);
+
+#endif // _WX_GENERIC_FONTDLGG_H
 
-#endif