Fix horizontal mouse wheel scrolling in wxGTK.

[wxWidgets.git] / src / generic / fontdlgg.cpp

diff --git a/src/generic/fontdlgg.cpp b/src/generic/fontdlgg.cpp
index be55ed2c084dbd0c7e7e44e05422b13cf6fd5d2d..58a7835c96384ad6931ee6530c268919cbd1410b 100644 (file)
--- a/src/generic/fontdlgg.cpp
+++ b/src/generic/fontdlgg.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98

-// RCS-ID:      $Id$

 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -76,7 +75,7 @@ void wxFontPreviewer::OnPaint(wxPaintEvent& WXUNUSED(event))
     dc.SetBrush(*wxWHITE_BRUSH);
     dc.DrawRectangle(0, 0, size.x, size.y);
 
     dc.SetBrush(*wxWHITE_BRUSH);
     dc.DrawRectangle(0, 0, size.x, size.y);
 

-    if ( font.Ok() )
+    if ( font.IsOk() )

     {
         dc.SetFont(font);
         dc.SetTextForeground(GetForegroundColour());
     {
         dc.SetFont(font);
         dc.SetTextForeground(GetForegroundColour());


@@ -506,10 +505,10 @@ void wxGenericFontDialog::CreateWidgets()
     if (m_colourChoice)
     {
         wxString name(wxTheColourDatabase->FindName(m_fontData.GetColour()));
     if (m_colourChoice)
     {
         wxString name(wxTheColourDatabase->FindName(m_fontData.GetColour()));

-        if (name.length())
-            m_colourChoice->SetStringSelection(name);
-        else
+        if ( name.empty() )

             m_colourChoice->SetStringSelection(wxT("BLACK"));
             m_colourChoice->SetStringSelection(wxT("BLACK"));

+        else
+            m_colourChoice->SetStringSelection(name);

     }
 
     if (m_underLineCheckBox)
     }
 
     if (m_underLineCheckBox)


@@ -550,7 +549,7 @@ void wxGenericFontDialog::InitializeFont()
     int fontSize = 12;
     bool fontUnderline = false;
 
     int fontSize = 12;
     bool fontUnderline = false;
 

-    if (m_fontData.m_initialFont.Ok())
+    if (m_fontData.m_initialFont.IsOk())

     {
         fontFamily = m_fontData.m_initialFont.GetFamily();
         fontWeight = m_fontData.m_initialFont.GetWeight();
     {
         fontFamily = m_fontData.m_initialFont.GetFamily();
         fontWeight = m_fontData.m_initialFont.GetWeight();


@@ -602,7 +601,7 @@ void wxGenericFontDialog::DoChangeFont()
         if ( !m_colourChoice->GetStringSelection().empty() )
         {
             wxColour col = wxTheColourDatabase->Find(m_colourChoice->GetStringSelection());
         if ( !m_colourChoice->GetStringSelection().empty() )
         {
             wxColour col = wxTheColourDatabase->Find(m_colourChoice->GetStringSelection());

-            if (col.Ok())
+            if (col.IsOk())

             {
                 m_fontData.m_fontColour = col;
             }
             {
                 m_fontData.m_fontColour = col;
             }


@@ -610,7 +609,7 @@ void wxGenericFontDialog::DoChangeFont()
     }
     // Update color here so that we can also use the color originally passed in
     // (EnableEffects may be false)
     }
     // Update color here so that we can also use the color originally passed in
     // (EnableEffects may be false)

-    if (m_fontData.m_fontColour.Ok())
+    if (m_fontData.m_fontColour.IsOk())

         m_previewer->SetForegroundColour(m_fontData.m_fontColour);
 
     m_previewer->Refresh();
         m_previewer->SetForegroundColour(m_fontData.m_fontColour);
 
     m_previewer->Refresh();