try to autodetect Win32 macros

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

diff --git a/include/wx/os2/font.h b/include/wx/os2/font.h
index 410e0bc200abc30f0bc2a0d333bbcc112c716ed2..fc8c8e55560eb7f1915173d7d7be4773759933fe 100644 (file)
--- a/include/wx/os2/font.h
+++ b/include/wx/os2/font.h
@@ -14,6 +14,7 @@
 
 #include "wx/gdiobj.h"
 #include "wx/os2/private.h"
 
 #include "wx/gdiobj.h"
 #include "wx/os2/private.h"

+#include "wx/fontutil.h"

 
 WXDLLEXPORT_DATA(extern const wxChar*) wxEmptyString;
 
 
 WXDLLEXPORT_DATA(extern const wxChar*) wxEmptyString;
 


@@ -42,6 +43,20 @@ public:
         (void)Create(nSize, nFamily, nStyle, nWeight, bUnderlined, rsFace, vEncoding);
     }
 
         (void)Create(nSize, nFamily, nStyle, nWeight, bUnderlined, rsFace, vEncoding);
     }
 

+    wxFont(const wxNativeFontInfo& rInfo)
+    {
+        Init();
+
+        (void)Create( rInfo.pointSize
+                     ,rInfo.family
+                     ,rInfo.style
+                     ,rInfo.weight
+                     ,rInfo.underlined
+                     ,rInfo.faceName
+                     ,rInfo.encoding
+                    );
+    }
+

     bool Create( int             nSize
                 ,int             nFamily
                 ,int             nStyle
     bool Create( int             nSize
                 ,int             nFamily
                 ,int             nStyle


@@ -92,6 +107,7 @@ public:
     virtual WXHANDLE GetResourceHandle(void);
     virtual bool     FreeResource(bool bForce = FALSE);
 
     virtual WXHANDLE GetResourceHandle(void);
     virtual bool     FreeResource(bool bForce = FALSE);
 

+    WXHFONT GetHFONT(void) const;

 protected:
     //
     // Common part of all ctors
 protected:
     //
     // Common part of all ctors