implement HitTest(pos) variant and not HitTest(x, y) one as this is what Windows...

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

diff --git a/include/wx/msw/fontdlg.h b/include/wx/msw/fontdlg.h
index 43d5d315beb5015e6d715f9b0f6264deb7c4c116..b68bb6ccf28b112183a415113856634a6e857845 100644 (file)
--- a/include/wx/msw/fontdlg.h
+++ b/include/wx/msw/fontdlg.h
@@ -6,41 +6,39 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:    wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef _WX_FONTDLG_H_
-#define _WX_FONTDLG_H_
+#ifndef _WX_MSW_FONTDLG_H_
+#define _WX_MSW_FONTDLG_H_
 
-#ifdef __GNUG__
-#pragma interface "fontdlg.h"
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
+    #pragma interface "fontdlg.h"
 #endif
 
-#include "wx/dialog.h"
-#include "wx/cmndata.h"
+// ----------------------------------------------------------------------------
+// wxFontDialog
+// ----------------------------------------------------------------------------
 
-/*
- * FONT DIALOG
- */
- 
-class WXDLLEXPORT wxFontDialog: public wxDialog
+class WXDLLEXPORT wxFontDialog : public wxFontDialogBase
 {
-DECLARE_DYNAMIC_CLASS(wxFontDialog)
-
 public:
-    wxFontDialog(void);
-    wxFontDialog(wxWindow *parent, wxFontData *data = NULL);
+    wxFontDialog() : wxFontDialogBase() { /* must be Create()d later */ }
+    wxFontDialog(wxWindow *parent)
+        : wxFontDialogBase(parent) { Create(parent); }
+    wxFontDialog(wxWindow *parent, const wxFontData& data)
+        : wxFontDialogBase(parent, data) { Create(parent, data); }
 
-    bool Create(wxWindow *parent, wxFontData *data = NULL);
+    virtual int ShowModal();
 
-    int ShowModal(void);
-    wxFontData& GetFontData(void) { return m_fontData; }
+    // deprecated interface, don't use
+    wxFontDialog(wxWindow *parent, const wxFontData *data)
+        : wxFontDialogBase(parent, data) { Create(parent, data); }
 
 protected:
-    wxWindow *m_dialogParent;
-    wxFontData m_fontData;
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxFontDialog)
 };
 
 #endif
-    // _WX_FONTDLG_H_
+    // _WX_MSW_FONTDLG_H_