Committed Jaako's renderer patch

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

diff --git a/include/wx/os2/fontdlg.h b/include/wx/os2/fontdlg.h
index 510641744cd1b0d1ac3b03c39fd921c8908a4c8f..27031b6fcf53ed26d13dd8a4343f26183c8769fc 100644 (file)
--- a/include/wx/os2/fontdlg.h
+++ b/include/wx/os2/fontdlg.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        fontdlg.h
+// Name:        wx/os2/fontdlg.h
 // Purpose:     wxFontDialog class. Use generic version if no
 //              platform-specific implementation.
 // Author:      David Webster
@@ -20,23 +20,41 @@
  * Font dialog
  */
 
-class WXDLLEXPORT wxFontDialog: public wxDialog
+class WXDLLEXPORT wxFontDialog: public wxFontDialogBase
 {
-DECLARE_DYNAMIC_CLASS(wxFontDialog)
 public:
-    wxFontDialog();
-    wxFontDialog(wxWindow *parent, wxFontData *data = NULL);
-
-    bool Create(wxWindow *parent, wxFontData *data = NULL);
-
-    int ShowModal();
-    wxFontData& GetFontData() { return m_fontData; }
-
-//EK protected:
-    wxWindow*   m_dialogParent;
-    wxFontData  m_fontData;
-};
+    wxFontDialog() : wxFontDialogBase() { /* must be Create()d later */ }
+    wxFontDialog (wxWindow* pParent) : wxFontDialogBase(pParent) { Create(pParent); }
+    wxFontDialog( wxWindow*         pParent
+                 ,const wxFontData& rData
+                )
+                : wxFontDialogBase( pParent
+                                   ,rData
+                                  )
+    {
+        Create( pParent
+               ,rData
+              );
+    }
+
+    virtual int ShowModal();
+
+#if WXWIN_COMPATIBILITY_2_6
+    //
+    // Deprecated interface, don't use
+    //
+    wxDEPRECATED( wxFontDialog( wxWindow* pParent, const wxFontData* pData ) );
+#endif // WXWIN_COMPATIBILITY_2_6
+
+protected:
+    DECLARE_DYNAMIC_CLASS(wxFontDialog)
+}; // end of 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
     // _WX_FONTDLG_H_
-