added wxSemaphore (with docs), new version of wxCondition and bug fixes to wxThread...

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

diff --git a/include/wx/generic/fontdlgg.h b/include/wx/generic/fontdlgg.h
index b02d7093b01ffd69f5c5472c34c6f24cae3e9d99..acf9d1d16ab1ae4655a927471fa3370c2d979135 100644 (file)
--- a/include/wx/generic/fontdlgg.h
+++ b/include/wx/generic/fontdlgg.h
@@ -29,6 +29,7 @@
 class WXDLLEXPORT wxChoice;
 class WXDLLEXPORT wxText;
 class WXDLLEXPORT wxCheckBox;
 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_UNDERLINE 3000
 #define wxID_FONT_STYLE     3001


@@ -45,15 +46,13 @@ class WXDLLEXPORT wxGenericFontDialog: public wxDialog
   wxFont dialogFont;
   wxWindow *dialogParent;
 
   wxFont dialogFont;
   wxWindow *dialogParent;
 

-  // Area reserved for font display
-  wxRect fontRect;
-

   wxChoice *familyChoice;
   wxChoice *styleChoice;
   wxChoice *weightChoice;
   wxChoice *colourChoice;
   wxCheckBox *underLineCheckBox;
   wxChoice   *pointSizeChoice;
   wxChoice *familyChoice;
   wxChoice *styleChoice;
   wxChoice *weightChoice;
   wxChoice *colourChoice;
   wxCheckBox *underLineCheckBox;
   wxChoice   *pointSizeChoice;

+  wxFontPreviewer *m_previewer;

   bool       m_useEvents;
 
 //  static bool fontDialogCancelled;
   bool       m_useEvents;
 
 //  static bool fontDialogCancelled;


@@ -70,26 +69,21 @@ class WXDLLEXPORT wxGenericFontDialog: public wxDialog
   inline wxFontData& GetFontData(void) { return fontData; }
 
   // Internal functions
   inline wxFontData& GetFontData(void) { return fontData; }
 
   // Internal functions

-  void OnPaint(wxPaintEvent& event);
-
-  bool OnClose(void);
+  void OnCloseWindow(wxCloseEvent& event);

 
   virtual void CreateWidgets(void);
   virtual void InitializeFont(void);
   
 
   virtual void CreateWidgets(void);
   virtual void InitializeFont(void);
   

-  virtual void PaintFontBackground(wxDC& dc);
-  virtual void PaintFont(wxDC& dc);
-

   void OnChangeFont(wxCommandEvent& event);
 
 DECLARE_EVENT_TABLE()
 };
 
   void OnChangeFont(wxCommandEvent& event);
 
 DECLARE_EVENT_TABLE()
 };
 

-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);
+wxChar WXDLLEXPORT *wxFontFamilyIntToString(int family);
+wxChar WXDLLEXPORT *wxFontWeightIntToString(int weight);
+wxChar WXDLLEXPORT *wxFontStyleIntToString(int style);
+int WXDLLEXPORT wxFontFamilyStringToInt(wxChar *family);
+int WXDLLEXPORT wxFontWeightStringToInt(wxChar *weight);
+int WXDLLEXPORT wxFontStyleStringToInt(wxChar *style);

 
 #endif
 
 #endif