wXMotif compilation fixes

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

diff --git a/include/wx/fontmap.h b/include/wx/fontmap.h
index 0b86555b000ae19d4256dbc5174526f25bc4a1e6..e5dc01d6e09305474042c8f50bafa8e2ab2e4796 100644 (file)
--- a/include/wx/fontmap.h
+++ b/include/wx/fontmap.h
@@ -24,6 +24,7 @@
 #include "wx/fontutil.h"    // for wxNativeEncodingInfo
 
 class WXDLLEXPORT wxConfigBase;
 #include "wx/fontutil.h"    // for wxNativeEncodingInfo
 
 class WXDLLEXPORT wxConfigBase;

+class WXDLLEXPORT wxWindow;

 
 // ----------------------------------------------------------------------------
 // wxFontMapper manages user-definable correspondence between logical font
 
 // ----------------------------------------------------------------------------
 // wxFontMapper manages user-definable correspondence between logical font

diff --git a/include/wx/unix/fontutil.h b/include/wx/unix/fontutil.h
index 6161a38e0f79a9a5279085ec9e629cb1e7c51cd1..ada65aa9f3b308d01971ca1cd0e801ef8cc4ec23 100644 (file)
--- a/include/wx/unix/fontutil.h
+++ b/include/wx/unix/fontutil.h
@@ -13,6 +13,7 @@
 #define _WX_UNIX_FONTUTIL_H_
 
 #ifdef __X__
 #define _WX_UNIX_FONTUTIL_H_
 
 #ifdef __X__

+    struct XFontStruct;

     typedef XFontStruct *wxNativeFont;
 #elif defined(__WXGTK__)
     typedef GdkFont *wxNativeFont;
     typedef XFontStruct *wxNativeFont;
 #elif defined(__WXGTK__)
     typedef GdkFont *wxNativeFont;

diff --git a/src/motif/font.cpp b/src/motif/font.cpp
index 3b690765e4133c10c3e792b9408a269a6b30c163..10ab6faf5bd090cad51e3be9991d855ff8a3a285 100644 (file)
--- a/src/motif/font.cpp
+++ b/src/motif/font.cpp
@@ -21,13 +21,14 @@
     #pragma implementation "font.h"
 #endif
 
     #pragma implementation "font.h"
 #endif
 

+#include <Xm/Xm.h>
+

 #include "wx/defs.h"
 #include "wx/string.h"
 #include "wx/font.h"
 #include "wx/gdicmn.h"
 #include "wx/defs.h"
 #include "wx/string.h"
 #include "wx/font.h"
 #include "wx/gdicmn.h"

-#include "wx/utils.h"
-
-#include <Xm/Xm.h>
+#include "wx/utils.h"       // for wxGetDisplay()
+#include "wx/fontutil.h"

 
 #if !USE_SHARED_LIBRARIES
     IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject)
 
 #if !USE_SHARED_LIBRARIES
     IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject)


@@ -39,7 +40,7 @@
 
 // For every wxFont, there must be a font for each display and scale requested.
 // So these objects are stored in wxFontRefData::m_fonts
 
 // For every wxFont, there must be a font for each display and scale requested.
 // So these objects are stored in wxFontRefData::m_fonts

-class wxXFont: public wxObject
+class wxXFont : public wxObject

 {
 public:
     wxXFont();
 {
 public:
     wxXFont();

diff --git a/src/unix/fontenum.cpp b/src/unix/fontenum.cpp
index e8a9c18f75d095c48a05e7f2ad60d34d92145af0..a1d374896eee08ef33c08ab9ca2fa7124d2c5d7e 100644 (file)
--- a/src/unix/fontenum.cpp
+++ b/src/unix/fontenum.cpp
@@ -26,6 +26,7 @@
 #include "wx/string.h"
 #include "wx/utils.h"
 
 #include "wx/string.h"
 #include "wx/utils.h"
 

+#include "wx/fontmap.h"

 #include "wx/fontenum.h"
 #include "wx/fontutil.h"
 
 #include "wx/fontenum.h"
 #include "wx/fontutil.h"
 


@@ -65,6 +66,12 @@ static char **CreateFontList(wxChar spacing,
     wxNativeEncodingInfo info;
     wxGetNativeFontEncoding(encoding, &info);
 
     wxNativeEncodingInfo info;
     wxGetNativeFontEncoding(encoding, &info);
 

+    if ( !wxTestFontEncoding(info) )
+    {
+        // ask font mapper for a replacement
+        (void)wxTheFontMapper->GetAltForEncoding(encoding, &info);
+    }
+

     wxString pattern;
     pattern.Printf(wxT("-*-*-*-*-*-*-*-*-*-*-%c-*-%s-%s"),
                    spacing,
     wxString pattern;
     pattern.Printf(wxT("-*-*-*-*-*-*-*-*-*-*-%c-*-%s-%s"),
                    spacing,

diff --git a/src/unix/fontutil.cpp b/src/unix/fontutil.cpp
index c32a5acfbbd50bf6105b007cd89ead9d2eb2106a..774dd534bd46e8020038e41848d35e0d6572ea2e 100644 (file)
--- a/src/unix/fontutil.cpp
+++ b/src/unix/fontutil.cpp
@@ -31,6 +31,14 @@
 #ifndef WX_PRECOMP
 #endif // PCH
 
 #ifndef WX_PRECOMP
 #endif // PCH
 

+#ifdef __X__
+    #include <X11/Xlib.h>
+
+    #include "wx/utils.h"       // for wxGetDisplay()
+#elif defined(__WXGTK__)
+    #include "gdk/gdk.h"
+#endif
+

 #include "wx/fontutil.h"
 #include "wx/fontmap.h"
 #include "wx/tokenzr.h"
 #include "wx/fontutil.h"
 #include "wx/fontmap.h"
 #include "wx/tokenzr.h"


@@ -51,8 +59,6 @@
         XFreeFont((Display *)wxGetDisplay(), font);
     }
 #elif defined(__WXGTK__)
         XFreeFont((Display *)wxGetDisplay(), font);
     }
 #elif defined(__WXGTK__)

-    #include "gdk/gdk.h"
-

     static inline wxNativeFont wxLoadFont(const wxString& fontSpec)
     {
         return gdk_font_load( wxConvertWX2MB(fontSpec) );
     static inline wxNativeFont wxLoadFont(const wxString& fontSpec)
     {
         return gdk_font_load( wxConvertWX2MB(fontSpec) );