signned/unsigned fix

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

diff --git a/include/wx/os2/fontdlg.h b/include/wx/os2/fontdlg.h
index 39da6fd9675d58e8f86f95e4d03be8bf482a2ef0..6fb9d30bf85585ba947e6b7a6a3ca24b4c0cfd16 100644 (file)
--- a/include/wx/os2/fontdlg.h
+++ b/include/wx/os2/fontdlg.h
@@ -2,41 +2,37 @@
 // Name:        fontdlg.h
 // Purpose:     wxFontDialog class. Use generic version if no
 //              platform-specific implementation.
 // Name:        fontdlg.h
 // 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 WXDLLEXPORT wxFontDialog: public wxFontDialogBase

 {
 DECLARE_DYNAMIC_CLASS(wxFontDialog)
 public:
     wxFontDialog();
 {
 DECLARE_DYNAMIC_CLASS(wxFontDialog)
 public:
     wxFontDialog();

-    wxFontDialog(wxWindow *parent, wxFontData *data = NULL);
+    wxFontDialog(wxWindow *parent, const wxFontData& rData);

 
 

-    bool Create(wxWindow *parent, wxFontData *data = NULL);
+    bool Create(wxWindow *parent, const wxFontData& rData);

 
     int ShowModal();
     wxFontData& GetFontData() { return m_fontData; }
 
 
     int ShowModal();
     wxFontData& GetFontData() { return m_fontData; }
 

-protected:
+//EK protected:

     wxWindow*   m_dialogParent;
     wxFontData  m_fontData;
 };
     wxWindow*   m_dialogParent;
     wxFontData  m_fontData;
 };