Added virtual wxPGProperty::ValueToString(). In derived property classes, now it...

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

diff --git a/include/wx/os2/fontdlg.h b/include/wx/os2/fontdlg.h
index 39da6fd9675d58e8f86f95e4d03be8bf482a2ef0..fadd23e1cb03279545e8f2ece0c17dba87300faa 100644 (file)
--- a/include/wx/os2/fontdlg.h
+++ b/include/wx/os2/fontdlg.h
@@ -1,46 +1,60 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        fontdlg.h
+// Name:        wx/os2/fontdlg.h

 // Purpose:     wxFontDialog class. Use generic version if no
 //              platform-specific implementation.
 // Purpose:     wxFontDialog class. Use generic version if no
 //              platform-specific implementation.

-// Author:      AUTHOR
+// Author:      David Webster

 // Modified by:
 // Modified by:

-// Created:     ??/??/98
+// Created:     10/06/99

 // RCS-ID:      $Id$
 // RCS-ID:      $Id$

-// Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
+// Copyright:   (c) David Webster
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_FONTDLG_H_
 #define _WX_FONTDLG_H_
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_FONTDLG_H_
 #define _WX_FONTDLG_H_
 

-#ifdef __GNUG__
-#pragma interface "fontdlg.h"
-#endif
-

 #include "wx/dialog.h"
 #include "wx/cmndata.h"
 
 /*
  * Font dialog
  */
 #include "wx/dialog.h"
 #include "wx/cmndata.h"
 
 /*
  * Font dialog
  */

- 
-class WXDLLEXPORT wxFontDialog: public wxDialog
+
+class WXDLLIMPEXP_CORE wxFontDialog: public wxFontDialogBase

 {
 {

-DECLARE_DYNAMIC_CLASS(wxFontDialog)

 public:
 public:

-    wxFontDialog();
-    wxFontDialog(wxWindow *parent, wxFontData *data = NULL);
-
-    bool Create(wxWindow *parent, wxFontData *data = NULL);
-
-    int ShowModal();
-    wxFontData& GetFontData() { return 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:
 
 protected:

-    wxWindow*   m_dialogParent;
-    wxFontData  m_fontData;
-};
+    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_
 
 #endif
     // _WX_FONTDLG_H_

-