compilation fixes for wxMSW

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8951 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/docs/changes.txt b/docs/changes.txt
index 4a95094a5e1945bd535b85c3d32ffcedbe14b01f..aa01794a8e00ad072b264e3facaed3c03b218bf7 100644 (file)
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -1,6 +1,13 @@
 wxWindows 2 Change Log
 ----------------------
 
+2.4.0
+-----
+
+wxBase:
+
+- wxMimeTypesManager now can create file associations too
+
 2.3.0
 -----
 

diff --git a/include/wx/font.h b/include/wx/font.h
index fe9632599cefe0d8fde6f9766a69656e7a4f5ba1..b5d1650c3b352e63fad096931097fb29b053378a 100644 (file)
--- a/include/wx/font.h
+++ b/include/wx/font.h
@@ -72,7 +72,7 @@ enum wxFontWeight
 // ----------------------------------------------------------------------------
 
 class WXDLLEXPORT wxFontRefData;
-class WXDLLEXPORT wxNativeFontInfo;
+struct WXDLLEXPORT wxNativeFontInfo;
 
 class WXDLLEXPORT wxFontBase : public wxGDIObject
 {

diff --git a/include/wx/msw/font.h b/include/wx/msw/font.h
index 12677e19d594b684b6996e0dec91edea71ad742e..47454c69e9bd8695587d3aae089959b56a5d68ef 100644 (file)
--- a/include/wx/msw/font.h
+++ b/include/wx/msw/font.h
@@ -44,10 +44,11 @@ public:
     {
         Init();
 
-        (void)Create(info.pointSize, info.family, info.style, info.weight,
-                     info.underlined, info.faceName, info.encoding);
+        Create(info);
     }
 
+    wxFont(const wxString& fontDesc);
+
     bool Create(int size,
                 int family,
                 int style,
@@ -56,6 +57,8 @@ public:
                 const wxString& face = wxEmptyString,
                 wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
 
+    bool Create(const wxNativeFontInfo& info);
+
     virtual ~wxFont();
 
     // assignment

diff --git a/src/common/fontcmn.cpp b/src/common/fontcmn.cpp
index 5d0050e77f6bc67401fe84de60e7d83dae7605bd..7044e66827f1e32b5b155b95d17b43a83cdf2d93 100644 (file)
--- a/src/common/fontcmn.cpp
+++ b/src/common/fontcmn.cpp
@@ -30,9 +30,10 @@
 
 #ifndef WX_PRECOMP
     #include "wx/font.h"
-    #include "wx/fontutil.h"
 #endif // WX_PRECOMP
 
+#include "wx/fontutil.h" // for wxNativeFontInfo
+
 #include "wx/tokenzr.h"
 
 // ============================================================================

diff --git a/src/common/fontmap.cpp b/src/common/fontmap.cpp
index 5032eeb6bf7b881db5fbdec65f97fe9d6c234ea2..9ea0196dd7336a7ee1bca8171527db6feaa9e293 100644 (file)
--- a/src/common/fontmap.cpp
+++ b/src/common/fontmap.cpp
@@ -32,9 +32,9 @@
     #include "wx/app.h"
     #include "wx/log.h"
     #include "wx/intl.h"
-    #include "wx/fontutil.h"
 #endif // PCH
 
+#include "wx/fontutil.h"
 #include "wx/fontmap.h"
 
 #if wxUSE_CONFIG

diff --git a/src/msw/data.cpp b/src/msw/data.cpp
index e9e1c75c78e729a2469f14a601606cebdf78d386..0a9c7286a28779aeddbc2f0d8357b4b35736e120 100644 (file)
--- a/src/msw/data.cpp
+++ b/src/msw/data.cpp
@@ -96,7 +96,6 @@ wxBrush   wxNullBrush;
 wxPalette wxNullPalette;
 wxFont    wxNullFont;
 wxColour  wxNullColour;
-wxNativeFontInfo wxNullNativeFontInfo;
 
 // Default window names
 const wxChar *wxControlNameStr = wxT("control");

diff --git a/src/msw/font.cpp b/src/msw/font.cpp
index acb3be04c59d3d989da7a0dd06d77f76f8cbbfd1..4fcafbeb96f444da105ee5b84687b301e18cae81 100644 (file)
--- a/src/msw/font.cpp
+++ b/src/msw/font.cpp
@@ -29,7 +29,6 @@
 #endif
 
 #ifndef WX_PRECOMP
-    #include <stdio.h>
     #include "wx/setup.h"
     #include "wx/list.h"
     #include "wx/utils.h"
@@ -38,6 +37,8 @@
     #include "wx/log.h"
 #endif // WX_PRECOMP
 
+#include "wx/fontutil.h"
+
 #include "wx/msw/private.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject)
@@ -166,6 +167,19 @@ void wxFont::Init()
         wxTheFontList->Append(this);
 }
 
+bool wxFont::Create(const wxNativeFontInfo& info)
+{
+    return Create(info.pointSize, info.family, info.style, info.weight,
+                  info.underlined, info.faceName, info.encoding);
+}
+
+wxFont::wxFont(const wxString& fontdesc)
+{
+    wxNativeFontInfo info;
+    if ( info.FromString(fontdesc) )
+        (void)Create(info);
+}
+
 /* Constructor for a font. Note that the real construction is done
  * in wxDC::SetFont, when information is available about scaling etc.
  */

diff --git a/src/msw/fontenum.cpp b/src/msw/fontenum.cpp
index b547ec12f4889cd7b0fac74f3644e49e8e0f3206..ca84524de7249b4d8f2e29b39d22bc3a72aabc4c 100644 (file)
--- a/src/msw/fontenum.cpp
+++ b/src/msw/fontenum.cpp
@@ -32,6 +32,7 @@
   #include "wx/font.h"
 #endif
 
+#include "wx/fontutil.h"
 #include "wx/fontenum.h"
 #include "wx/fontmap.h"