Ensure there is valid context for DrawRectangle

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

diff --git a/src/generic/fontdlgg.cpp b/src/generic/fontdlgg.cpp
index 2fc244125e8a2bb84b56d8d62e0d79dfbf5d1d70..70c59b66f9bbfb7bab8f6c00caf39354d628c6e3 100644 (file)
--- a/src/generic/fontdlgg.cpp
+++ b/src/generic/fontdlgg.cpp
@@ -32,7 +32,6 @@
     #include "wx/checkbox.h"
     #include "wx/intl.h"
     #include "wx/settings.h"
-    #include "wx/cmndata.h"
     #include "wx/sizer.h"
 #endif
 
@@ -77,7 +76,7 @@ void wxFontPreviewer::OnPaint(wxPaintEvent& WXUNUSED(event))
     dc.SetBrush(*wxWHITE_BRUSH);
     dc.DrawRectangle(0, 0, size.x, size.y);
 
-    if ( font.Ok() )
+    if ( font.IsOk() )
     {
         dc.SetFont(font);
         dc.SetTextForeground(GetForegroundColour());
@@ -282,11 +281,11 @@ void wxGenericFontDialog::OnCloseWindow(wxCloseEvent& WXUNUSED(event))
 
 bool wxGenericFontDialog::DoCreate(wxWindow *parent)
 {
-    parent = GetParentForModalDialog(parent);
+    parent = GetParentForModalDialog(parent, 0);
 
-    if ( !wxDialog::Create( parent , wxID_ANY , _T("Choose Font") ,
+    if ( !wxDialog::Create( parent , wxID_ANY , wxT("Choose Font") ,
                             wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE,
-        _T("fontdialog") ) )
+        wxT("fontdialog") ) )
     {
         wxFAIL_MSG( wxT("wxFontDialog creation failed") );
         return false;
@@ -507,10 +506,10 @@ void wxGenericFontDialog::CreateWidgets()
     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"));
+        else
+            m_colourChoice->SetStringSelection(name);
     }
 
     if (m_underLineCheckBox)
@@ -551,7 +550,7 @@ void wxGenericFontDialog::InitializeFont()
     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();
@@ -603,7 +602,7 @@ void wxGenericFontDialog::DoChangeFont()
         if ( !m_colourChoice->GetStringSelection().empty() )
         {
             wxColour col = wxTheColourDatabase->Find(m_colourChoice->GetStringSelection());
-            if (col.Ok())
+            if (col.IsOk())
             {
                 m_fontData.m_fontColour = col;
             }
@@ -611,7 +610,7 @@ void wxGenericFontDialog::DoChangeFont()
     }
     // 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();