Fix for Unicode conversion.

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

diff --git a/src/os2/fontdlg.cpp b/src/os2/fontdlg.cpp
index 60e8e9b987958d84ca818de0d767cad90438f9c3..56afb1cc61b7d1b85b856f4099711618c76c2288 100644 (file)
--- a/src/os2/fontdlg.cpp
+++ b/src/os2/fontdlg.cpp
@@ -2,48 +2,59 @@
 // 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:
-// Created:     ??/??/98
+// Created:     10/06/99
 // 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
 
-#include "wx/stubs/fontdlg.h"
+#include "wx/fontdlg.h"
+
+#define INCL_PM
+#include <os2.h>
+
+#include "wx/os2/private.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)
-#endif
 
 /*
  * wxFontDialog
  */
-
 wxFontDialog::wxFontDialog()
 {
     m_dialogParent = NULL;
 }
 
-wxFontDialog::wxFontDialog(wxWindow *parent, wxFontData *data)
+wxFontDialog::wxFontDialog(wxWindow *parent, const wxFontData& rData)
 {
-    Create(parent, data);
+    Create(parent, rData);
 }
 
-bool wxFontDialog::Create(wxWindow *parent, wxFontData *data)
+bool wxFontDialog::Create(wxWindow *parent, const wxFontData& rData)
 {
     m_dialogParent = parent;
 
-    if (data)
-        m_fontData = *data;
-
-    // TODO: you may need to do dialog creation here, unless it's
-    // done in ShowModal.
+    m_fontData = rData;
     return TRUE;
 }