Reworked Frame class

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

diff --git a/include/wx/msw/fontdlg.h b/include/wx/msw/fontdlg.h
index 43d5d315beb5015e6d715f9b0f6264deb7c4c116..f404b7e065889aab562763350ddd754b42745710 100644 (file)
--- a/include/wx/msw/fontdlg.h
+++ b/include/wx/msw/fontdlg.h
@@ -6,41 +6,41 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // 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__
 
 #ifdef __GNUG__

-#pragma interface "fontdlg.h"
+    #pragma interface "fontdlg.h"

 #endif
 
 #include "wx/dialog.h"
 #include "wx/cmndata.h"
 
 #endif
 
 #include "wx/dialog.h"
 #include "wx/cmndata.h"
 

-/*
- * FONT DIALOG
- */
- 
-class WXDLLEXPORT wxFontDialog: public wxDialog
-{
-DECLARE_DYNAMIC_CLASS(wxFontDialog)
+// ----------------------------------------------------------------------------
+// wxFontDialog
+// ----------------------------------------------------------------------------

 
 

+class WXDLLEXPORT wxFontDialog : public wxDialog
+{

 public:
 public:

-    wxFontDialog(void);
+    wxFontDialog();

     wxFontDialog(wxWindow *parent, wxFontData *data = NULL);
 
     bool Create(wxWindow *parent, wxFontData *data = NULL);
 
     wxFontDialog(wxWindow *parent, wxFontData *data = NULL);
 
     bool Create(wxWindow *parent, wxFontData *data = NULL);
 

-    int ShowModal(void);
-    wxFontData& GetFontData(void) { return m_fontData; }
+    virtual int ShowModal();
+
+    wxFontData& GetFontData() { return m_fontData; }

 
 protected:
 
 protected:

-    wxWindow *m_dialogParent;

     wxFontData m_fontData;
     wxFontData m_fontData;

+
+    DECLARE_DYNAMIC_CLASS(wxFontDialog)

 };
 
 #endif
 };
 
 #endif

-    // _WX_FONTDLG_H_
+    // _WX_MSW_FONTDLG_H_