The check column needs more space

[wxWidgets.git] / src / gtk1 / fontdlg.cpp

diff --git a/src/gtk1/fontdlg.cpp b/src/gtk1/fontdlg.cpp
index 982850c35ef23d0786af15c092b2114a0489a30a..03d12f1e9ffd476273ea1eb23cd494222389f117 100644 (file)
--- a/src/gtk1/fontdlg.cpp
+++ b/src/gtk1/fontdlg.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        gtk/fontdlg.cpp
+// Name:        src/gtk1/fontdlg.cpp
 // Purpose:     wxFontDialog
 // Author:      Robert Roebling
 // Id:          $Id$
@@ -10,18 +10,17 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
-#include "wx/defs.h"
+#if wxUSE_FONTDLG && !defined(__WXGPE__)
 
-#if wxUSE_FONTDLG
+#include "wx/fontdlg.h"
 
-#ifndef __WXGPE__
+#ifndef WX_PRECOMP
+    #include "wx/intl.h"
+    #include "wx/utils.h"
+    #include "wx/msgdlg.h"
+#endif
 
-#include "wx/fontdlg.h"
 #include "wx/fontutil.h"
-#include "wx/utils.h"
-#include "wx/intl.h"
-#include "wx/debug.h"
-#include "wx/msgdlg.h"
 
 #include "wx/gtk1/private.h"
 
@@ -52,7 +51,7 @@ bool gtk_fontdialog_delete_callback( GtkWidget *WXUNUSED(widget), GdkEvent *WXUN
 
     win->Close();
 
-    return TRUE;
+    return true;
 }
 }
 
@@ -85,7 +84,7 @@ void gtk_fontdialog_ok_callback( GtkWidget *WXUNUSED(widget), wxFontDialog *dial
 
     wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, wxID_OK);
     event.SetEventObject( dialog );
-    dialog->GetEventHandler()->ProcessEvent( event );
+    dialog->HandleWindowEvent( event );
 }
 }
 
@@ -102,7 +101,7 @@ void gtk_fontdialog_cancel_callback( GtkWidget *WXUNUSED(w), wxFontDialog *dialo
 
     wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL);
     event.SetEventObject( dialog );
-    dialog->GetEventHandler()->ProcessEvent( event );
+    dialog->HandleWindowEvent( event );
 }
 }
 
@@ -114,14 +113,14 @@ IMPLEMENT_DYNAMIC_CLASS(wxFontDialog, wxDialog)
 
 bool wxFontDialog::DoCreate(wxWindow *parent)
 {
-    m_needParent = FALSE;
+    m_needParent = false;
 
     if (!PreCreation( parent, wxDefaultPosition, wxDefaultSize ) ||
         !CreateBase( parent, -1, wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE,
                      wxDefaultValidator, wxT("fontdialog") ))
     {
         wxFAIL_MSG( wxT("wxFontDialog creation failed") );
-        return FALSE;
+        return false;
     }
 
     wxString m_message( _("Choose font") );
@@ -169,7 +168,7 @@ bool wxFontDialog::DoCreate(wxWindow *parent)
         }
     }
 
-    return TRUE;
+    return true;
 }
 
 wxFontDialog::~wxFontDialog()
@@ -181,7 +180,4 @@ void wxFontDialog::SetChosenFont(const char *fontname)
     m_fontData.SetChosenFont(wxFont( wxString::FromAscii(fontname) ));
 }
 
-#endif // wxUSE_FONTDLG
-
-#endif // GPE
-
+#endif // wxUSE_FONTDLG && !defined(__WXGPE__)