reverted Julians changes to the pragmas

[wxWidgets.git] / src / os2 / fontdlg.cpp

diff --git a/src/os2/fontdlg.cpp b/src/os2/fontdlg.cpp
index 60e8e9b987958d84ca818de0d767cad90438f9c3..065949e3c18e9bbd7fb63e4feab7a1138a83ae53 100644 (file)
--- a/src/os2/fontdlg.cpp
+++ b/src/os2/fontdlg.cpp
@@ -2,29 +2,44 @@
 // Name:        fontdlg.cpp
 // Purpose:     wxFontDialog class. NOTE: you can use the generic class
 //              if you wish, instead of implementing this.
 // Name:        fontdlg.cpp
 // Purpose:     wxFontDialog class. NOTE: you can use the generic class
 //              if you wish, instead of implementing this.

-// 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

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "fontdlg.h"
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifndef WX_PRECOMP
+#include <stdio.h>
+#include "wx/defs.h"
+#include "wx/utils.h"
+#include "wx/dialog.h"

 #endif
 
 #endif
 

-#include "wx/stubs/fontdlg.h"
+#include "wx/fontdlg.h"
+
+#define INCL_PM
+#include <os2.h>
+
+#include "wx/os2/private.h"

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

-#if !USE_SHARED_LIBRARY
+#include <math.h>
+#include <stdlib.h>
+#include <string.h>
+
+#define wxDIALOG_DEFAULT_X 300
+#define wxDIALOG_DEFAULT_Y 300
+

 IMPLEMENT_DYNAMIC_CLASS(wxFontDialog, wxDialog)
 IMPLEMENT_DYNAMIC_CLASS(wxFontDialog, wxDialog)

-#endif

 
 /*
  * wxFontDialog
  */
 
 /*
  * wxFontDialog
  */

-

 wxFontDialog::wxFontDialog()
 {
     m_dialogParent = NULL;
 wxFontDialog::wxFontDialog()
 {
     m_dialogParent = NULL;


@@ -41,9 +56,6 @@ bool wxFontDialog::Create(wxWindow *parent, wxFontData *data)
 
     if (data)
         m_fontData = *data;
 
     if (data)
         m_fontData = *data;

-
-    // TODO: you may need to do dialog creation here, unless it's
-    // done in ShowModal.

     return TRUE;
 }
 
     return TRUE;
 }