Fixed player dialog listbox size and app icon on wxGTK

[wxWidgets.git] / src / motif / font.cpp

diff --git a/src/motif/font.cpp b/src/motif/font.cpp
index b8911db0d19ea738ea1c363be585a041e4f92d49..fc503f190f49488c7fc36192871bba2a9821b375 100644 (file)
--- a/src/motif/font.cpp
+++ b/src/motif/font.cpp
@@ -20,8 +20,6 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

-#include "wx/defs.h"
-

 #ifdef __VMS
 #pragma message disable nosimpint
 #include "wx/vms_x_fix.h"
 #ifdef __VMS
 #pragma message disable nosimpint
 #include "wx/vms_x_fix.h"


@@ -31,23 +29,21 @@
 #pragma message enable nosimpint
 #endif
 
 #pragma message enable nosimpint
 #endif
 

-#include "wx/string.h"

 #include "wx/font.h"
 #include "wx/font.h"

-#include "wx/gdicmn.h"
-#include "wx/utils.h"       // for wxGetDisplay()
+
+#ifndef WX_PRECOMP
+    #include "wx/string.h"
+    #include "wx/utils.h"       // for wxGetDisplay()
+    #include "wx/settings.h"
+    #include "wx/gdicmn.h"
+#endif
+

 #include "wx/fontutil.h"    // for wxNativeFontInfo
 #include "wx/tokenzr.h"
 #include "wx/fontutil.h"    // for wxNativeFontInfo
 #include "wx/tokenzr.h"

-#include "wx/settings.h"

 #include "wx/motif/private.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject)
 
 #include "wx/motif/private.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject)
 

-#if wxCHECK_MOTIF_VERSION( 2, 0 ) && !wxCHECK_LESSTIF()
-    #define wxUSE_RENDER_TABLE 1
-#else
-    #define wxUSE_RENDER_TABLE 0
-#endif
-

 // ----------------------------------------------------------------------------
 // private classes
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // private classes
 // ----------------------------------------------------------------------------


@@ -58,14 +54,14 @@ class wxXFont : public wxObject
 {
 public:
     wxXFont();
 {
 public:
     wxXFont();

-    ~wxXFont();
+    virtual ~wxXFont();

 
 #if !wxMOTIF_NEW_FONT_HANDLING
     WXFontStructPtr     m_fontStruct;   // XFontStruct
 #endif
 
 #if !wxMOTIF_NEW_FONT_HANDLING
     WXFontStructPtr     m_fontStruct;   // XFontStruct
 #endif

-#if !wxUSE_RENDER_TABLE && !wxMOTIF_NEW_FONT_HANDLING
+#if !wxMOTIF_USE_RENDER_TABLE

     WXFontList          m_fontList;     // Motif XmFontList
     WXFontList          m_fontList;     // Motif XmFontList

-#else // if wxUSE_RENDER_TABLE
+#else // if wxMOTIF_USE_RENDER_TABLE

     WXRenderTable       m_renderTable;  // Motif XmRenderTable
     WXRendition         m_rendition;    // Motif XmRendition
 #endif
     WXRenderTable       m_renderTable;  // Motif XmRenderTable
     WXRendition         m_rendition;    // Motif XmRendition
 #endif


@@ -95,7 +91,7 @@ public:
              data.m_underlined, data.m_faceName, data.m_encoding);
     }
 
              data.m_underlined, data.m_faceName, data.m_encoding);
     }
 

-    ~wxFontRefData();
+    virtual ~wxFontRefData();

 
 protected:
     // common part of all ctors
 
 protected:
     // common part of all ctors


@@ -135,9 +131,9 @@ wxXFont::wxXFont()
 #if !wxMOTIF_NEW_FONT_HANDLING
     m_fontStruct = (WXFontStructPtr) 0;
 #endif
 #if !wxMOTIF_NEW_FONT_HANDLING
     m_fontStruct = (WXFontStructPtr) 0;
 #endif

-#if !wxUSE_RENDER_TABLE && !wxMOTIF_NEW_FONT_HANDLING
+#if !wxMOTIF_USE_RENDER_TABLE

     m_fontList = (WXFontList) 0;
     m_fontList = (WXFontList) 0;

-#else // if wxUSE_RENDER_TABLE
+#else // if wxMOTIF_USE_RENDER_TABLE

     m_renderTable = (WXRenderTable) 0;
     m_rendition   = (WXRendition) 0;
 #endif
     m_renderTable = (WXRenderTable) 0;
     m_rendition   = (WXRendition) 0;
 #endif


@@ -147,11 +143,11 @@ wxXFont::wxXFont()
 
 wxXFont::~wxXFont()
 {
 
 wxXFont::~wxXFont()
 {

-#if !wxUSE_RENDER_TABLE
+#if !wxMOTIF_USE_RENDER_TABLE

     if (m_fontList)
         XmFontListFree ((XmFontList) m_fontList);
     m_fontList = NULL;
     if (m_fontList)
         XmFontListFree ((XmFontList) m_fontList);
     m_fontList = NULL;

-#else // if wxUSE_RENDER_TABLE
+#else // if wxMOTIF_USE_RENDER_TABLE

     if (m_renderTable)
         XmRenderTableFree ((XmRenderTable) m_renderTable);
     m_renderTable = NULL;
     if (m_renderTable)
         XmRenderTableFree ((XmRenderTable) m_renderTable);
     m_renderTable = NULL;


@@ -215,21 +211,17 @@ wxFontRefData::~wxFontRefData()
     m_fonts.Clear();
 }
 
     m_fonts.Clear();
 }
 

+#define M_FONTDATA ((wxFontRefData*)m_refData)
+

 // ----------------------------------------------------------------------------
 // wxFont
 // ----------------------------------------------------------------------------
 
 wxFont::wxFont(const wxNativeFontInfo& info)
 {
 // ----------------------------------------------------------------------------
 // wxFont
 // ----------------------------------------------------------------------------
 
 wxFont::wxFont(const wxNativeFontInfo& info)
 {

-    Init();
-

     (void)Create(info.GetXFontName());
 }
 
     (void)Create(info.GetXFontName());
 }
 

-void wxFont::Init()
-{
-}
-

 bool wxFont::Create(int pointSize,
                     int family,
                     int style,
 bool wxFont::Create(int pointSize,
                     int family,
                     int style,


@@ -242,8 +234,6 @@ bool wxFont::Create(int pointSize,
     m_refData = new wxFontRefData(pointSize, family, style, weight,
                                   underlined, faceName, encoding);
 
     m_refData = new wxFontRefData(pointSize, family, style, weight,
                                   underlined, faceName, encoding);
 

-    RealizeResource();
-

     return true;
 }
 
     return true;
 }
 


@@ -290,7 +280,7 @@ bool wxFont::Create(const wxString& fontname, wxFontEncoding enc)
     tmp = tn.GetNextToken();                     // pointsize
     if (tmp != wxT("*"))
     {
     tmp = tn.GetNextToken();                     // pointsize
     if (tmp != wxT("*"))
     {

-        long num = wxStrtol (tmp.c_str(), (wxChar **) NULL, 10);
+        long num = wxStrtol (tmp.mb_str(), (wxChar **) NULL, 10);

         M_FONTDATA->m_pointSize = (int)(num / 10);
     }
 
         M_FONTDATA->m_pointSize = (int)(num / 10);
     }
 


@@ -379,8 +369,6 @@ void wxFont::SetPointSize(int pointSize)
 
     M_FONTDATA->m_pointSize = pointSize;
     M_FONTDATA->m_nativeFontInfo.GetXFontName().Clear(); // invalid now
 
     M_FONTDATA->m_pointSize = pointSize;
     M_FONTDATA->m_nativeFontInfo.GetXFontName().Clear(); // invalid now

-
-    RealizeResource();

 }
 
 void wxFont::SetFamily(int family)
 }
 
 void wxFont::SetFamily(int family)


@@ -389,8 +377,6 @@ void wxFont::SetFamily(int family)
 
     M_FONTDATA->m_family = family;
     M_FONTDATA->m_nativeFontInfo.GetXFontName().Clear(); // invalid now
 
     M_FONTDATA->m_family = family;
     M_FONTDATA->m_nativeFontInfo.GetXFontName().Clear(); // invalid now

-
-    RealizeResource();

 }
 
 void wxFont::SetStyle(int style)
 }
 
 void wxFont::SetStyle(int style)


@@ -399,8 +385,6 @@ void wxFont::SetStyle(int style)
 
     M_FONTDATA->m_style = style;
     M_FONTDATA->m_nativeFontInfo.GetXFontName().Clear(); // invalid now
 
     M_FONTDATA->m_style = style;
     M_FONTDATA->m_nativeFontInfo.GetXFontName().Clear(); // invalid now

-
-    RealizeResource();

 }
 
 void wxFont::SetWeight(int weight)
 }
 
 void wxFont::SetWeight(int weight)


@@ -409,18 +393,16 @@ void wxFont::SetWeight(int weight)
 
     M_FONTDATA->m_weight = weight;
     M_FONTDATA->m_nativeFontInfo.GetXFontName().Clear(); // invalid now
 
     M_FONTDATA->m_weight = weight;
     M_FONTDATA->m_nativeFontInfo.GetXFontName().Clear(); // invalid now

-
-    RealizeResource();

 }
 
 }
 

-void wxFont::SetFaceName(const wxString& faceName)
+bool wxFont::SetFaceName(const wxString& faceName)

 {
     Unshare();
 
     M_FONTDATA->m_faceName = faceName;
     M_FONTDATA->m_nativeFontInfo.GetXFontName().Clear(); // invalid now
 
 {
     Unshare();
 
     M_FONTDATA->m_faceName = faceName;
     M_FONTDATA->m_nativeFontInfo.GetXFontName().Clear(); // invalid now
 

-    RealizeResource();
+    return wxFontBase::SetFaceName(faceName);

 }
 
 void wxFont::SetUnderlined(bool underlined)
 }
 
 void wxFont::SetUnderlined(bool underlined)


@@ -428,8 +410,6 @@ void wxFont::SetUnderlined(bool underlined)
     Unshare();
 
     M_FONTDATA->m_underlined = underlined;
     Unshare();
 
     M_FONTDATA->m_underlined = underlined;

-
-    RealizeResource();

 }
 
 void wxFont::SetEncoding(wxFontEncoding encoding)
 }
 
 void wxFont::SetEncoding(wxFontEncoding encoding)


@@ -438,8 +418,6 @@ void wxFont::SetEncoding(wxFontEncoding encoding)
 
     M_FONTDATA->m_encoding = encoding;
     M_FONTDATA->m_nativeFontInfo.GetXFontName().Clear(); // invalid now
 
     M_FONTDATA->m_encoding = encoding;
     M_FONTDATA->m_nativeFontInfo.GetXFontName().Clear(); // invalid now

-
-    RealizeResource();

 }
 
 void wxFont::DoSetNativeFontInfo(const wxNativeFontInfo& info)
 }
 
 void wxFont::DoSetNativeFontInfo(const wxNativeFontInfo& info)


@@ -462,7 +440,7 @@ int wxFont::GetPointSize() const
 
 wxString wxFont::GetFaceName() const
 {
 
 wxString wxFont::GetFaceName() const
 {

-    wxCHECK_MSG( Ok(), wxT(""), wxT("invalid font") );
+    wxCHECK_MSG( Ok(), wxEmptyString, wxT("invalid font") );

 
     return M_FONTDATA->m_faceName ;
 }
 
     return M_FONTDATA->m_faceName ;
 }


@@ -506,7 +484,7 @@ const wxNativeFontInfo *wxFont::GetNativeFontInfo() const
 {
     wxCHECK_MSG( Ok(), (wxNativeFontInfo *)NULL, wxT("invalid font") );
 
 {
     wxCHECK_MSG( Ok(), (wxNativeFontInfo *)NULL, wxT("invalid font") );
 

-    if(M_FONTDATA->m_nativeFontInfo.GetXFontName().IsEmpty())
+    if(M_FONTDATA->m_nativeFontInfo.GetXFontName().empty())

         GetInternalFont();
 
     return &(M_FONTDATA->m_nativeFontInfo);
         GetInternalFont();
 
     return &(M_FONTDATA->m_nativeFontInfo);


@@ -564,15 +542,15 @@ wxXFont* wxFont::GetInternalFont(double scale, WXDisplay* display) const
 #endif
     f->m_display = ( display ? display : wxGetDisplay() );
     f->m_scale = intScale;
 #endif
     f->m_display = ( display ? display : wxGetDisplay() );
     f->m_scale = intScale;

-    
-#if wxUSE_RENDER_TABLE
+
+#if wxMOTIF_USE_RENDER_TABLE

     XmRendition rendition;
     XmRenderTable renderTable;
     Arg args[5];
     int count = 0;
 
 #if wxMOTIF_NEW_FONT_HANDLING
     XmRendition rendition;
     XmRenderTable renderTable;
     Arg args[5];
     int count = 0;
 
 #if wxMOTIF_NEW_FONT_HANDLING

-    wxChar* fontSpec = wxStrdup( xFontSpec.c_str() );
+    char* fontSpec = wxStrdup(xFontSpec.mb_str());

     XtSetArg( args[count], XmNfontName, fontSpec ); ++count;
     XtSetArg( args[count], XmNfontType, XmFONT_IS_FONTSET ); ++count;
 #else
     XtSetArg( args[count], XmNfontName, fontSpec ); ++count;
     XtSetArg( args[count], XmNfontType, XmFONT_IS_FONTSET ); ++count;
 #else


@@ -589,7 +567,7 @@ wxXFont* wxFont::GetInternalFont(double scale, WXDisplay* display) const
     f->m_renderTable = (WXRenderTable)renderTable;
     f->m_rendition = (WXRendition)rendition;
     wxASSERT( f->m_renderTable != NULL );
     f->m_renderTable = (WXRenderTable)renderTable;
     f->m_rendition = (WXRendition)rendition;
     wxASSERT( f->m_renderTable != NULL );

-#else // if !wxUSE_RENDER_TABLE
+#else // if !wxMOTIF_USE_RENDER_TABLE

     f->m_fontList = XmFontListCreate ((XFontStruct*) font, XmSTRING_DEFAULT_CHARSET);
     wxASSERT( f->m_fontList != NULL );
 #endif
     f->m_fontList = XmFontListCreate ((XFontStruct*) font, XmSTRING_DEFAULT_CHARSET);
     wxASSERT( f->m_fontList != NULL );
 #endif


@@ -608,38 +586,31 @@ WXFontStructPtr wxFont::GetFontStruct(double scale, WXDisplay* display) const
     return (f ? f->m_fontStruct : (WXFontStructPtr) 0);
 }
 
     return (f ? f->m_fontStruct : (WXFontStructPtr) 0);
 }
 

+#endif
+
+#if !wxMOTIF_USE_RENDER_TABLE
+

 WXFontList wxFont::GetFontList(double scale, WXDisplay* display) const
 {
 WXFontList wxFont::GetFontList(double scale, WXDisplay* display) const
 {

-#if !wxUSE_RENDER_TABLE

     wxXFont* f = GetInternalFont(scale, display);
 
     return (f ? f->m_fontList : (WXFontList) 0);
     wxXFont* f = GetInternalFont(scale, display);
 
     return (f ? f->m_fontList : (WXFontList) 0);

-#else
-    return NULL;
-#endif

 }
 
 }
 

-#endif // !wxMOTIF_NEW_FONT_HANDLING
-
- // declared in the header, can't use wxUSE_RENDER_TABLE
-#if wxCHECK_MOTIF_VERSION( 2, 0 )
+#else // if wxMOTIF_USE_RENDER_TABLE

 
 WXRenderTable wxFont::GetRenderTable(WXDisplay* display) const
 {
 
 WXRenderTable wxFont::GetRenderTable(WXDisplay* display) const
 {

-#if wxUSE_RENDER_TABLE

     wxXFont* f = GetInternalFont(1.0, display);
 
     wxXFont* f = GetInternalFont(1.0, display);
 

-    return (f ? f->m_renderTable : (WXFontList) 0);
-#else
-    return NULL;
-#endif
+    return (f ? f->m_renderTable : (WXRenderTable) 0);

 }
 
 }
 

-#endif // wxCHECK_MOTIF_VERSION( 2, 0 )
+#endif // wxMOTIF_USE_RENDER_TABLE

 
 WXFontType wxFont::GetFontType(WXDisplay* display) const
 {
 
 WXFontType wxFont::GetFontType(WXDisplay* display) const
 {

-#if wxUSE_RENDER_TABLE
+#if wxMOTIF_USE_RENDER_TABLE

     return Ok() ? GetRenderTable(display) : NULL;
 #else
     return Ok() ? GetFontList(1.0, display) : NULL;
     return Ok() ? GetRenderTable(display) : NULL;
 #else
     return Ok() ? GetFontList(1.0, display) : NULL;


@@ -648,7 +619,7 @@ WXFontType wxFont::GetFontType(WXDisplay* display) const
 
 WXFontType wxFont::GetFontTypeC(WXDisplay* display) const
 {
 
 WXFontType wxFont::GetFontTypeC(WXDisplay* display) const
 {

-#if wxUSE_RENDER_TABLE
+#if wxMOTIF_USE_RENDER_TABLE

     return Ok() ? GetRenderTable(display) : NULL;
 #else
     return Ok() ? XmFontListCopy( (XmFontList)GetFontList(1.0, display) ) : NULL;
     return Ok() ? GetRenderTable(display) : NULL;
 #else
     return Ok() ? XmFontListCopy( (XmFontList)GetFontList(1.0, display) ) : NULL;


@@ -657,14 +628,14 @@ WXFontType wxFont::GetFontTypeC(WXDisplay* display) const
 
 /*static*/ WXString wxFont::GetFontTag()
 {
 
 /*static*/ WXString wxFont::GetFontTag()
 {

-#if wxUSE_RENDER_TABLE
+#if wxMOTIF_USE_RENDER_TABLE

     return (WXString)XmNrenderTable;
 #else
     return (WXString)XmNfontList;
 #endif
 }
 
     return (WXString)XmNrenderTable;
 #else
     return (WXString)XmNfontList;
 #endif
 }
 

-#if wxMOTIF_NEW_FONT_HANDLING
+#if wxMOTIF_USE_RENDER_TABLE

 
 WXFontSet wxFont::GetFontSet(double scale, WXDisplay* display) const
 {
 
 WXFontSet wxFont::GetFontSet(double scale, WXDisplay* display) const
 {


@@ -687,16 +658,16 @@ void wxGetTextExtent(WXDisplay* display, const wxFont& font, double scale,
 {
     XRectangle ink, logical;
     WXFontSet fset = font.GetFontSet(scale, display);
 {
     XRectangle ink, logical;
     WXFontSet fset = font.GetFontSet(scale, display);

-    
-    XmbTextExtents( (XFontSet)fset, str.c_str(), str.length(), &ink, &logical);
+
+    XmbTextExtents( (XFontSet)fset, str.mb_str(), str.length(), &ink, &logical);

 
     if( width ) *width = logical.width;
     if( height ) *height = logical.height;
 
     if( width ) *width = logical.width;
     if( height ) *height = logical.height;

-    if( ascent ) *ascent = -logical.y;    
-    if( descent ) *descent = logical.height + logical.y;    
+    if( ascent ) *ascent = -logical.y;
+    if( descent ) *descent = logical.height + logical.y;

 }
 
 }
 

-#else // if !wxMOTIF_NEW_FONT_HANDLING
+#else // if !wxMOTIF_USE_RENDER_TABLE

 
 void wxGetTextExtent(WXDisplay* display, const wxFont& font,
                      double scale, const wxString& str,
 
 void wxGetTextExtent(WXDisplay* display, const wxFont& font,
                      double scale, const wxString& str,


@@ -706,9 +677,10 @@ void wxGetTextExtent(WXDisplay* display, const wxFont& font,
 
     int direction, ascent2, descent2;
     XCharStruct overall;
 
     int direction, ascent2, descent2;
     XCharStruct overall;

-    int slen = str.Len();
+    int slen = str.length();

 
 

-    XTextExtents((XFontStruct*) pFontStruct, (char*) str.c_str(), slen,
+    XTextExtents((XFontStruct*) pFontStruct,
+                 wx_const_cast(char*, (const char *)str.mb_str()), slen,

                  &direction, &ascent2, &descent2, &overall);
 
     if ( width )
                  &direction, &ascent2, &descent2, &overall);
 
     if ( width )


@@ -721,4 +693,4 @@ void wxGetTextExtent(WXDisplay* display, const wxFont& font,
         *ascent = ascent2;
 }
 
         *ascent = ascent2;
 }
 

-#endif // !wxMOTIF_NEW_FONT_HANDLING
+#endif // !wxMOTIF_USE_RENDER_TABLE