fixing modal dialog quit after nested message box problem

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

diff --git a/src/x11/font.cpp b/src/x11/font.cpp
index 859175c11bfb522768cc126c36ed29701dabd4f8..7e3ec5f6dcf4f1b2ac0ce5040210fbcd5eb3d9a5 100644 (file)
--- a/src/x11/font.cpp
+++ b/src/x11/font.cpp
@@ -93,15 +93,15 @@ wxXFont::~wxXFont()
 // wxFontRefData
 // ----------------------------------------------------------------------------
 
 // wxFontRefData
 // ----------------------------------------------------------------------------
 

-class wxFontRefData: public wxObjectRefData
+class wxFontRefData: public wxGDIRefData

 {
 friend class wxFont;
 
 public:
     wxFontRefData(int size = wxDEFAULT,
 {
 friend class wxFont;
 
 public:
     wxFontRefData(int size = wxDEFAULT,

-                  int family = wxDEFAULT,
-                  int style = wxDEFAULT,
-                  int weight = wxDEFAULT,
+                  wxFontFamily family = wxFONTFAMILY_DEFAULT,
+                  wxFontStyle style = wxFONTSTYLE_NORMAL,
+                  wxFontWeight weight = wxFONTWEIGHT_NORMAL,

                   bool underlined = false,
                   const wxString& faceName = wxEmptyString,
                   wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
                   bool underlined = false,
                   const wxString& faceName = wxEmptyString,
                   wxFontEncoding encoding = wxFONTENCODING_DEFAULT);


@@ -118,9 +118,9 @@ public:
     // setters: all of them also take care to modify m_nativeFontInfo if we
     // have it so as to not lose the information not carried by our fields
     void SetPointSize(int pointSize);
     // setters: all of them also take care to modify m_nativeFontInfo if we
     // have it so as to not lose the information not carried by our fields
     void SetPointSize(int pointSize);

-    void SetFamily(int family);
-    void SetStyle(int style);
-    void SetWeight(int weight);
+    void SetFamily(wxFontFamily family);
+    void SetStyle(wxFontStyle style);
+    void SetWeight(wxFontWeight weight);

     void SetUnderlined(bool underlined);
     bool SetFaceName(const wxString& facename);
     void SetEncoding(wxFontEncoding encoding);
     void SetUnderlined(bool underlined);
     bool SetFaceName(const wxString& facename);
     void SetEncoding(wxFontEncoding encoding);


@@ -134,9 +134,9 @@ public:
 protected:
     // common part of all ctors
     void Init(int size,
 protected:
     // common part of all ctors
     void Init(int size,

-              int family,
-              int style,
-              int weight,
+              wxFontFamily family,
+              wxFontStyle style,
+              wxFontWeight weight,

               bool underlined,
               const wxString& faceName,
               wxFontEncoding encoding);
               bool underlined,
               const wxString& faceName,
               wxFontEncoding encoding);


@@ -146,9 +146,9 @@ protected:
 
     // font attributes
     int           m_pointSize;
 
     // font attributes
     int           m_pointSize;

-    int           m_family;
-    int           m_style;
-    int           m_weight;
+    wxFontFamily  m_family;
+    wxFontStyle   m_style;
+    wxFontWeight  m_weight;

     bool          m_underlined;
     wxString      m_faceName;
     wxFontEncoding m_encoding;   // Unused in Unicode mode
     bool          m_underlined;
     wxString      m_faceName;
     wxFontEncoding m_encoding;   // Unused in Unicode mode


@@ -172,9 +172,9 @@ protected:
 // ----------------------------------------------------------------------------
 
 void wxFontRefData::Init(int pointSize,
 // ----------------------------------------------------------------------------
 
 void wxFontRefData::Init(int pointSize,

-                         int family,
-                         int style,
-                         int weight,
+                         wxFontFamily family,
+                         wxFontStyle style,
+                         wxFontWeight weight,

                          bool underlined,
                          const wxString& faceName,
                          wxFontEncoding encoding)
                          bool underlined,
                          const wxString& faceName,
                          wxFontEncoding encoding)


@@ -325,8 +325,8 @@ void wxFontRefData::InitFromNative()
         }
     }
 
         }
     }
 

-    switch ( wxToupper(*m_nativeFontInfo.
-                            GetXFontComponent(wxXLFD_SLANT).c_str()) )
+    switch ( wxToupper( m_nativeFontInfo.
+                       GetXFontComponent(wxXLFD_SLANT)[0u]).GetValue() )

     {
         case _T('I'):   // italique
             m_style = wxFONTSTYLE_ITALIC;
     {
         case _T('I'):   // italique
             m_style = wxFONTSTYLE_ITALIC;


@@ -402,7 +402,7 @@ void wxFontRefData::InitFromNative()
 }
 
 wxFontRefData::wxFontRefData( const wxFontRefData& data )
 }
 
 wxFontRefData::wxFontRefData( const wxFontRefData& data )

-             : wxObjectRefData()
+             : wxGDIRefData()

 {
     m_pointSize = data.m_pointSize;
     m_family = data.m_family;
 {
     m_pointSize = data.m_pointSize;
     m_family = data.m_family;


@@ -419,8 +419,8 @@ wxFontRefData::wxFontRefData( const wxFontRefData& data )
     m_nativeFontInfo = data.m_nativeFontInfo;
 }
 
     m_nativeFontInfo = data.m_nativeFontInfo;
 }
 

-wxFontRefData::wxFontRefData(int size, int family, int style,
-                             int weight, bool underlined,
+wxFontRefData::wxFontRefData(int size, wxFontFamily family, wxFontStyle style,
+                             wxFontWeight weight, bool underlined,

                              const wxString& faceName,
                              wxFontEncoding encoding)
 {
                              const wxString& faceName,
                              wxFontEncoding encoding)
 {


@@ -474,14 +474,14 @@ void wxFontRefData::SetPointSize(int pointSize)
 #endif
 }
 
 #endif
 }
 

-void wxFontRefData::SetFamily(int family)
+void wxFontRefData::SetFamily(wxFontFamily family)

 {
     m_family = family;
 
     // TODO: what are we supposed to do with m_nativeFontInfo here?
 }
 
 {
     m_family = family;
 
     // TODO: what are we supposed to do with m_nativeFontInfo here?
 }
 

-void wxFontRefData::SetStyle(int style)
+void wxFontRefData::SetStyle(wxFontStyle style)

 {
     m_style = style;
 
 {
     m_style = style;
 


@@ -507,7 +507,7 @@ void wxFontRefData::SetStyle(int style)
 #endif
 }
 
 #endif
 }
 

-void wxFontRefData::SetWeight(int weight)
+void wxFontRefData::SetWeight(wxFontWeight weight)

 {
     m_weight = weight;
 }
 {
     m_weight = weight;
 }


@@ -561,9 +561,9 @@ wxFont::wxFont(const wxNativeFontInfo& info)
 }
 
 bool wxFont::Create(int pointSize,
 }
 
 bool wxFont::Create(int pointSize,

-                    int family,
-                    int style,
-                    int weight,
+                    wxFontFamily family,
+                    wxFontStyle style,
+                    wxFontWeight weight,

                     bool underlined,
                     const wxString& faceName,
                     wxFontEncoding encoding)
                     bool underlined,
                     const wxString& faceName,
                     wxFontEncoding encoding)


@@ -601,18 +601,18 @@ bool wxFont::Create(const wxString& fontname, wxFontEncoding enc)
     M_FONTDATA->m_faceName = tn.GetNextToken();  // family
 
     tmp = tn.GetNextToken().MakeUpper();         // weight
     M_FONTDATA->m_faceName = tn.GetNextToken();  // family
 
     tmp = tn.GetNextToken().MakeUpper();         // weight

-    if (tmp == wxT("BOLD")) M_FONTDATA->m_weight = wxBOLD;
-    if (tmp == wxT("BLACK")) M_FONTDATA->m_weight = wxBOLD;
-    if (tmp == wxT("EXTRABOLD")) M_FONTDATA->m_weight = wxBOLD;
-    if (tmp == wxT("DEMIBOLD")) M_FONTDATA->m_weight = wxBOLD;
-    if (tmp == wxT("ULTRABOLD")) M_FONTDATA->m_weight = wxBOLD;
+    if (tmp == wxT("BOLD")) M_FONTDATA->m_weight = wxFONTWEIGHT_BOLD;
+    if (tmp == wxT("BLACK")) M_FONTDATA->m_weight = wxFONTWEIGHT_BOLD;
+    if (tmp == wxT("EXTRABOLD")) M_FONTDATA->m_weight = wxFONTWEIGHT_BOLD;
+    if (tmp == wxT("DEMIBOLD")) M_FONTDATA->m_weight = wxFONTWEIGHT_BOLD;
+    if (tmp == wxT("ULTRABOLD")) M_FONTDATA->m_weight = wxFONTWEIGHT_BOLD;

 
 

-    if (tmp == wxT("LIGHT")) M_FONTDATA->m_weight = wxLIGHT;
-    if (tmp == wxT("THIN")) M_FONTDATA->m_weight = wxLIGHT;
+    if (tmp == wxT("LIGHT")) M_FONTDATA->m_weight = wxFONTWEIGHT_LIGHT;
+    if (tmp == wxT("THIN")) M_FONTDATA->m_weight = wxFONTWEIGHT_LIGHT;

 
     tmp = tn.GetNextToken().MakeUpper();        // slant
 
     tmp = tn.GetNextToken().MakeUpper();        // slant

-    if (tmp == wxT("I")) M_FONTDATA->m_style = wxITALIC;
-    if (tmp == wxT("O")) M_FONTDATA->m_style = wxITALIC;
+    if (tmp == wxT("I")) M_FONTDATA->m_style = wxFONTSTYLE_ITALIC;
+    if (tmp == wxT("O")) M_FONTDATA->m_style = wxFONTSTYLE_ITALIC;

 
     tn.GetNextToken();                           // set width
     tn.GetNextToken();                           // add. style
 
     tn.GetNextToken();                           // set width
     tn.GetNextToken();                           // add. style


@@ -631,17 +631,17 @@ bool wxFont::Create(const wxString& fontname, wxFontEncoding enc)
     tmp = tn.GetNextToken().MakeUpper();         // spacing
 
     if (tmp == wxT("M"))
     tmp = tn.GetNextToken().MakeUpper();         // spacing
 
     if (tmp == wxT("M"))

-        M_FONTDATA->m_family = wxMODERN;
+        M_FONTDATA->m_family = wxFONTFAMILY_MODERN;

     else if (M_FONTDATA->m_faceName == wxT("TIMES"))
     else if (M_FONTDATA->m_faceName == wxT("TIMES"))

-        M_FONTDATA->m_family = wxROMAN;
+        M_FONTDATA->m_family = wxFONTFAMILY_ROMAN;

     else if (M_FONTDATA->m_faceName == wxT("HELVETICA"))
     else if (M_FONTDATA->m_faceName == wxT("HELVETICA"))

-        M_FONTDATA->m_family = wxSWISS;
+        M_FONTDATA->m_family = wxFONTFAMILY_SWISS;

     else if (M_FONTDATA->m_faceName == wxT("LUCIDATYPEWRITER"))
     else if (M_FONTDATA->m_faceName == wxT("LUCIDATYPEWRITER"))

-        M_FONTDATA->m_family = wxTELETYPE;
+        M_FONTDATA->m_family = wxFONTFAMILY_TELETYPE;

     else if (M_FONTDATA->m_faceName == wxT("LUCIDA"))
     else if (M_FONTDATA->m_faceName == wxT("LUCIDA"))

-        M_FONTDATA->m_family = wxDECORATIVE;
+        M_FONTDATA->m_family = wxFONTFAMILY_DECORATIVE;

     else if (M_FONTDATA->m_faceName == wxT("UTOPIA"))
     else if (M_FONTDATA->m_faceName == wxT("UTOPIA"))

-        M_FONTDATA->m_family = wxSCRIPT;
+        M_FONTDATA->m_family = wxFONTFAMILY_SCRIPT;

 
     tn.GetNextToken();                           // avg width
 
 
     tn.GetNextToken();                           // avg width
 


@@ -686,6 +686,16 @@ wxFont::~wxFont()
 {
 }
 
 {
 }
 

+wxGDIRefData *wxFont::CreateGDIRefData() const
+{
+    return new wxFontRefData;
+}
+
+wxGDIRefData *wxFont::CloneGDIRefData(const wxGDIRefData *data) const
+{
+    return new wxFontRefData(*static_cast<const wxFontRefData *>(data));
+}
+

 // ----------------------------------------------------------------------------
 // change the font attributes
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // change the font attributes
 // ----------------------------------------------------------------------------


@@ -723,23 +733,23 @@ wxString wxFont::GetFaceName() const
     return M_FONTDATA->m_faceName;
 }
 
     return M_FONTDATA->m_faceName;
 }
 

-int wxFont::GetFamily() const
+wxFontFamily wxFont::GetFamily() const

 {
 {

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

 
     return M_FONTDATA->m_family;
 }
 
 
     return M_FONTDATA->m_family;
 }
 

-int wxFont::GetStyle() const
+wxFontStyle wxFont::GetStyle() const

 {
 {

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

 
     return M_FONTDATA->m_style;
 }
 
 
     return M_FONTDATA->m_style;
 }
 

-int wxFont::GetWeight() const
+wxFontWeight wxFont::GetWeight() const

 {
 {

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

 
     return M_FONTDATA->m_weight;
 }
 
     return M_FONTDATA->m_weight;
 }


@@ -767,7 +777,7 @@ bool wxFont::GetNoAntiAliasing() const
 
 const wxNativeFontInfo *wxFont::GetNativeFontInfo() const
 {
 
 const wxNativeFontInfo *wxFont::GetNativeFontInfo() const
 {

-    wxCHECK_MSG( Ok(), (wxNativeFontInfo *)NULL, wxT("invalid font") );
+    wxCHECK_MSG( Ok(), NULL, wxT("invalid font") );

 
 #if wxUSE_UNICODE
 #else
 
 #if wxUSE_UNICODE
 #else


@@ -812,21 +822,21 @@ void wxFont::SetPointSize(int pointSize)
     M_FONTDATA->SetPointSize(pointSize);
 }
 
     M_FONTDATA->SetPointSize(pointSize);
 }
 

-void wxFont::SetFamily(int family)
+void wxFont::SetFamily(wxFontFamily family)

 {
     Unshare();
 
     M_FONTDATA->SetFamily(family);
 }
 
 {
     Unshare();
 
     M_FONTDATA->SetFamily(family);
 }
 

-void wxFont::SetStyle(int style)
+void wxFont::SetStyle(wxFontStyle style)

 {
     Unshare();
 
     M_FONTDATA->SetStyle(style);
 }
 
 {
     Unshare();
 
     M_FONTDATA->SetStyle(style);
 }
 

-void wxFont::SetWeight(int weight)
+void wxFont::SetWeight(wxFontWeight weight)

 {
     Unshare();
 
 {
     Unshare();
 


@@ -882,7 +892,7 @@ void wxFont::SetNoAntiAliasing( bool no )
 wxXFont* wxFont::GetInternalFont(double scale, WXDisplay* display) const
 {
     if ( !Ok() )
 wxXFont* wxFont::GetInternalFont(double scale, WXDisplay* display) const
 {
     if ( !Ok() )

-        return (wxXFont *)NULL;
+        return NULL;

 
     long intScale = long(scale * 100.0 + 0.5); // key for wxXFont
     int pointSize = (M_FONTDATA->m_pointSize * 10 * intScale) / 100;
 
     long intScale = long(scale * 100.0 + 0.5); // key for wxXFont
     int pointSize = (M_FONTDATA->m_pointSize * 10 * intScale) / 100;


@@ -917,7 +927,7 @@ wxXFont* wxFont::GetInternalFont(double scale, WXDisplay* display) const
     {
         wxFAIL_MSG( wxT("Could not allocate even a default font -- something is wrong.") );
 
     {
         wxFAIL_MSG( wxT("Could not allocate even a default font -- something is wrong.") );
 

-        return (wxXFont*) NULL;
+        return NULL;

     }
 
     wxXFont* f = new wxXFont;
     }
 
     wxXFont* f = new wxXFont;