Removed some bugs

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

diff --git a/src/gtk/font.cpp b/src/gtk/font.cpp
index a048a12227d0426ac0dedd564f2f3ed7a7040707..2152854752a24da066716e1d87d51cafb713cf87 100644 (file)
--- a/src/gtk/font.cpp
+++ b/src/gtk/font.cpp
@@ -21,15 +21,19 @@
 //-----------------------------------------------------------------------------
 
 static char *wx_font_family [] = {
-    "wxDEFAULT", "wxDECORATIVE", "wxMODERN", "wxROMAN", "wxSCRIPT",
-    "wxSWISS", "wxTELETYPE",
+    "wxDEFAULT", "wxDECORATIVE", "wxROMAN", "wxSCRIPT",
+    "wxSWISS", "wxMODERN", "wxTELETYPE",
 };
+
+/*
 static char *wx_font_style [] = {
     "wxDEFAULT", "wxNORMAL", "wxSLANT", "wxITALIC",
 };
+
 static char *wx_font_weight [] = {
     "wxDEFAULT", "wxNORMAL", "wxBOLD", "wxLIGHT",
 };
+*/
 
 extern wxFontNameDirectory *wxTheFontNameDirectory;
 
@@ -66,9 +70,9 @@ wxFontRefData::wxFontRefData(void) : m_scaled_xfonts(wxKEY_INTEGER)
   m_weight = -1;
   m_underlined = FALSE;
   m_fontId = 0;
-  m_faceName = NULL;
-  m_font = NULL;
-};
+  m_faceName = (char *) NULL;
+  m_font = (GdkFont *) NULL;
+}
 
 wxFontRefData::~wxFontRefData(void)
 {
@@ -79,14 +83,14 @@ wxFontRefData::~wxFontRefData(void)
     wxNode *next = node->Next();
     gdk_font_unref( font );
     node = next;
-  };
+  }
   if (m_faceName) 
   {
     delete m_faceName;
-    m_faceName = NULL;
-  };
+    m_faceName = (char *) NULL;
+  }
   if (m_font) gdk_font_unref( m_font );
-};
+}
 
 //-----------------------------------------------------------------------------
 
@@ -97,7 +101,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject)
 wxFont::wxFont(void)
 {
   if (wxTheFontList) wxTheFontList->Append( this );
-};
+}
 
 wxFont::wxFont( char *xFontName )
 {
@@ -107,7 +111,7 @@ wxFont::wxFont( char *xFontName )
   
   M_FONTDATA->m_byXFontName = TRUE;
   M_FONTDATA->m_font = gdk_font_load( xFontName );
-};
+}
 
 wxFont::wxFont(int PointSize, int FontIdOrFamily, int Style, int Weight,
               bool Underlined, const char* Face)
@@ -123,14 +127,14 @@ wxFont::wxFont(int PointSize, int FontIdOrFamily, int Style, int Weight,
   {
     M_FONTDATA->m_fontId = FontIdOrFamily;
     M_FONTDATA->m_family  = wxTheFontNameDirectory->GetFamily( FontIdOrFamily );
-  };
+  }
   M_FONTDATA->m_style = Style;
   M_FONTDATA->m_weight = Weight;
   M_FONTDATA->m_pointSize = PointSize;
   M_FONTDATA->m_underlined = Underlined;
 
   if (wxTheFontList) wxTheFontList->Append( this );
-};
+}
 
 wxFont::wxFont(int PointSize, const char *Face, int Family, int Style, 
               int Weight, bool Underlined)
@@ -146,105 +150,147 @@ wxFont::wxFont(int PointSize, const char *Face, int Family, int Style,
   M_FONTDATA->m_underlined = Underlined;
 
   if (wxTheFontList) wxTheFontList->Append( this );
-};
+}
 
 wxFont::wxFont( const wxFont& font )
 { 
   Ref( font ); 
-};
+  
+  if (wxTheFontList) wxTheFontList->Append( this );
+}
 
 wxFont::wxFont( const wxFont* font ) 
 { 
   UnRef(); 
   if (font) Ref( *font ); 
-};
+  
+  if (wxTheFontList) wxTheFontList->Append( this );
+}
 
 wxFont::~wxFont(void)
 {
   if (wxTheFontList) wxTheFontList->DeleteObject( this );
-};
+}
 
 wxFont& wxFont::operator = ( const wxFont& font ) 
 { 
   if (*this == font) return (*this); 
   Ref( font ); 
   return *this; 
-};
+}
 
 bool wxFont::operator == ( const wxFont& font ) 
 { 
   return m_refData == font.m_refData; 
-};
+}
 
 bool wxFont::operator != ( const wxFont& font ) 
 { 
   return m_refData != font.m_refData; 
-};
+}
 
 bool wxFont::Ok()
 {
   return (m_refData != NULL);
-};
+}
 
 int wxFont::GetPointSize(void) const
 {
   return M_FONTDATA->m_pointSize;
-};
+}
 
 wxString wxFont::GetFaceString(void) const
 {
   wxString s = wxTheFontNameDirectory->GetFontName( M_FONTDATA->m_fontId );
   return s;
-};
+}
 
 wxString wxFont::GetFaceName(void) const
 {
   wxString s = wxTheFontNameDirectory->GetFontName( M_FONTDATA->m_fontId );
   return s; 
-};
+}
 
 int wxFont::GetFamily(void) const
 {
   return M_FONTDATA->m_family;
-};
+}
 
 wxString wxFont::GetFamilyString(void) const
 {
-  wxString s = wx_font_family[M_FONTDATA->m_family];
+  wxString s = wx_font_family[M_FONTDATA->m_family - wxDEFAULT];
   return s;
-};
+}
 
 int wxFont::GetFontId(void) const
 {
   return M_FONTDATA->m_fontId; // stub
-};
+}
 
 int wxFont::GetStyle(void) const
 {
   return M_FONTDATA->m_style;
-};
+}
 
 wxString wxFont::GetStyleString(void) const
 {
-  wxString s =  wx_font_style[M_FONTDATA->m_style];
-  return s;
-};
+    switch (M_FONTDATA->m_style)
+    {
+        case wxNORMAL:
+        {
+            return wxString("wxNORMAL");
+        }
+        case wxSLANT:
+        {
+            return wxString("wxSLANT");
+        }
+        case wxITALIC:
+        {
+            return wxString("wxITALIC");
+        }
+        case wxDEFAULT:
+        default:
+        {
+            return wxString("wxDEFAULT");
+        }
+    }
+    return wxString("wxDEFAULT");
+}
 
 int wxFont::GetWeight(void) const
 {
   return M_FONTDATA->m_weight;
-};
+}
 
 wxString wxFont::GetWeightString(void) const
 {
-  wxString s = wx_font_weight[M_FONTDATA->m_weight];
-  return s;
-};
+    switch (M_FONTDATA->m_weight)
+    {
+        case wxNORMAL:
+        {
+            return wxString("wxNORMAL");
+        }
+        case wxBOLD:
+        {
+            return wxString("wxBOLD");
+        }
+        case wxLIGHT:
+        {
+            return wxString("wxLIGHT");
+        }
+        case wxDEFAULT:
+        default:
+        {
+            return wxString("wxDEFAULT");
+        }
+    }
+    return wxString("wxDEFAULT");
+}
 
 bool wxFont::GetUnderlined(void) const
 {
   return M_FONTDATA->m_underlined;
-};
+}
 
 //-----------------------------------------------------------------------------
 // get internal representation of font
@@ -261,7 +307,7 @@ GdkFont *wxFont::GetInternalFont(float scale) const
    
   long int_scale = long(scale * 100.0 + 0.5); // key for fontlist
   int point_scale = (M_FONTDATA->m_pointSize * 10 * int_scale) / 100;
-  GdkFont *font = NULL;
+  GdkFont *font = (GdkFont *) NULL;
 
   wxNode *node = M_FONTDATA->m_scaled_xfonts.Find(int_scale);
   if (node) 
@@ -273,12 +319,12 @@ GdkFont *wxFont::GetInternalFont(float scale) const
      font = wxLoadQueryNearestFont( point_scale, M_FONTDATA->m_fontId, M_FONTDATA->m_style,
                                    M_FONTDATA->m_weight, M_FONTDATA->m_underlined );
      M_FONTDATA->m_scaled_xfonts.Append( int_scale, (wxObject*)font );
-  };
+  }
   if (!font)
        printf("could not load any font");
 //     wxError("could not load any font", "wxFont");
   return font;
-};
+}
 
 //-----------------------------------------------------------------------------
 // local utilities to find a X font
@@ -434,7 +480,7 @@ static char *font_defaults[] = {
     "-${ScreenSwissBase}${ScreenStdSuffix}",
     "ScreenScript__",
     "-${ScreenScriptBase}${ScreenStdSuffix}",
-    NULL
+    (char *) NULL
 };
 
 enum {wxWEIGHT_NORMAL, wxWEIGHT_BOLD,  wxWEIGHT_LIGHT, wxNUM_WEIGHTS};
@@ -448,7 +494,7 @@ static int WCoordinate(int w)
     case wxNORMAL:
     default:       return wxWEIGHT_NORMAL;
     }
-}
+};
 
 static int SCoordinate(int s)
 {
@@ -458,7 +504,7 @@ static int SCoordinate(int s)
     case wxNORMAL:
     default:       return wxSTYLE_NORMAL;
     }
-}
+};
 
 //-----------------------------------------------------------------------------
 // wxSuffixMap
@@ -488,8 +534,8 @@ static void SearchResource(const char *prefix, const char **names, int count, ch
 
     k = 1 << count;
     
-    *v = NULL;
-    internal = NULL;
+    *v = (char *) NULL;
+    internal = (char *) NULL;
 
     for (i = 0; i < k; i++) {
        strcpy(resource, prefix);
@@ -524,7 +570,7 @@ wxSuffixMap::~wxSuffixMap(void)
        for (j = 0; j < wxNUM_STYLES; ++j)
            if (map[k][j]) {
                delete[] map[k][j];
-               map[k][j] = NULL;
+               map[k][j] = (char *) NULL;
            }
 }
 
@@ -567,7 +613,7 @@ void wxSuffixMap::Initialize(const char *resname, const char *devresname)
                    ++i;
                } else if (v[i] == closer) {
                    int newstrlen;
-                   const char *r = NULL; bool delete_r = FALSE;
+                   const char *r = (char *) NULL; bool delete_r = FALSE;
                    char *name;
          
                    name = v + startpos + 2;
@@ -678,7 +724,7 @@ wxFontNameItem::~wxFontNameItem(void)
 {
     if (name)
        delete[] name;
-    name = NULL;
+    name = (char *) NULL;
 }
 
 #if WXDEBUG
@@ -734,7 +780,7 @@ void wxFontNameDirectory::Initialize(int fontid, int family, const char *resname
     char *fam, resource[256];
   
     sprintf(resource, "Family%s", resname);
-    SearchResource((const char *)resource, NULL, 0, (char **)&fam);
+    SearchResource((const char *)resource, (const char **) NULL, 0, (char **)&fam);
     if (fam) {
        if      (!strcmp(fam, "Default"))       family = wxDEFAULT;
        else if (!strcmp(fam, "Roman"))         family = wxROMAN;
@@ -765,7 +811,7 @@ char *wxFontNameDirectory::GetScreenName(int fontid, int weight, int style)
     if (item)
        return item->GetScreenName(weight, style);
     // font does not exist
-    return NULL;
+    return (char *) NULL;
 }
 
 char *wxFontNameDirectory::GetPostScriptName(int fontid, int weight, int style)
@@ -774,7 +820,7 @@ char *wxFontNameDirectory::GetPostScriptName(int fontid, int weight, int style)
     if (item)
        return item->GetPostScriptName(weight, style);
     // font does not exist
-    return NULL;
+    return (char *) NULL;
 }
 
 char *wxFontNameDirectory::GetAFMName(int fontid, int weight, int style)
@@ -783,7 +829,7 @@ char *wxFontNameDirectory::GetAFMName(int fontid, int weight, int style)
     if (item)
        return item->GetAFMName(weight, style);
     // font does not exist
-    return NULL;
+    return (char *) NULL;
 }
 
 char *wxFontNameDirectory::GetFontName(int fontid)
@@ -792,7 +838,7 @@ char *wxFontNameDirectory::GetFontName(int fontid)
     if (item)
        return item->GetName();
     // font does not exist
-    return NULL;
+    return (char *) NULL;
 }
 
 int wxFontNameDirectory::GetFontId(const char *name)