motif compilation fixes

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

diff --git a/src/motif/data.cpp b/src/motif/data.cpp
index 543d3178067c1d7f2a21a728eadbc6be3144547e..eb1c8e0713066ae5d82fedcb96ce7ae53fcc7f19 100644 (file)
--- a/src/motif/data.cpp
+++ b/src/motif/data.cpp
@@ -87,7 +87,6 @@ wxBrush  wxNullBrush;
 wxPalette wxNullPalette;
 wxFont   wxNullFont;
 wxColour wxNullColour;
-wxNativeFontInfo wxNullNativeFontInfo;
 
 // Default window names
 const char *wxButtonNameStr = "button";

diff --git a/src/motif/font.cpp b/src/motif/font.cpp
index d81184b0d1b98d879b38183a66e1c7f52054a26a..c5d72cd94df249f2ae88801d1a45dc39c175d6e0 100644 (file)
--- a/src/motif/font.cpp
+++ b/src/motif/font.cpp
@@ -186,7 +186,7 @@ wxFontRefData::~wxFontRefData()
 // wxFont
 // ----------------------------------------------------------------------------
 
-wxFont(const wxNativeFontInfo& info)
+wxFont::wxFont(const wxNativeFontInfo& info)
 {
     Init();