projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename delegates to try and stop name clashes, probably with wxWebKitCtrl.
[wxWidgets.git]
/
src
/
gtk1
/
fontdlg.cpp
diff --git
a/src/gtk1/fontdlg.cpp
b/src/gtk1/fontdlg.cpp
index fb9b7393981520c9b0816fa9da4fd0160d6303a0..5b9a04bba4fd7d0561f61e24b8e21985d684f630 100644
(file)
--- a/
src/gtk1/fontdlg.cpp
+++ b/
src/gtk1/fontdlg.cpp
@@
-10,16
+10,17
@@
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
-#if wxUSE_FONTDLG
-
-#ifndef __WXGPE__
+#if wxUSE_FONTDLG && !defined(__WXGPE__)
#include "wx/fontdlg.h"
#include "wx/fontdlg.h"
+
+#ifndef WX_PRECOMP
+ #include "wx/intl.h"
+ #include "wx/utils.h"
+ #include "wx/msgdlg.h"
+#endif
+
#include "wx/fontutil.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"
#include "wx/gtk1/private.h"
@@
-83,7
+84,7
@@
void gtk_fontdialog_ok_callback( GtkWidget *WXUNUSED(widget), wxFontDialog *dial
wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, wxID_OK);
event.SetEventObject( dialog );
wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, wxID_OK);
event.SetEventObject( dialog );
- dialog->
GetEventHandler()->Process
Event( event );
+ dialog->
HandleWindow
Event( event );
}
}
}
}
@@
-100,7
+101,7
@@
void gtk_fontdialog_cancel_callback( GtkWidget *WXUNUSED(w), wxFontDialog *dialo
wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL);
event.SetEventObject( dialog );
wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL);
event.SetEventObject( dialog );
- dialog->
GetEventHandler()->Process
Event( event );
+ dialog->
HandleWindow
Event( event );
}
}
}
}
@@
-147,7
+148,7
@@
bool wxFontDialog::DoCreate(wxWindow *parent)
GTK_SIGNAL_FUNC(gtk_fontdialog_delete_callback), (gpointer)this );
wxFont font = m_fontData.GetInitialFont();
GTK_SIGNAL_FUNC(gtk_fontdialog_delete_callback), (gpointer)this );
wxFont font = m_fontData.GetInitialFont();
- if( font.Ok() )
+ if( font.
Is
Ok() )
{
const wxNativeFontInfo *info = font.GetNativeFontInfo();
{
const wxNativeFontInfo *info = font.GetNativeFontInfo();
@@
-163,7
+164,7
@@
bool wxFontDialog::DoCreate(wxWindow *parent)
else
{
// this is not supposed to happen!
else
{
// this is not supposed to happen!
- wxFAIL_MSG(
_
T("font is ok but no native font info?"));
+ wxFAIL_MSG(
wx
T("font is ok but no native font info?"));
}
}
}
}
@@
-179,6
+180,4
@@
void wxFontDialog::SetChosenFont(const char *fontname)
m_fontData.SetChosenFont(wxFont( wxString::FromAscii(fontname) ));
}
m_fontData.SetChosenFont(wxFont( wxString::FromAscii(fontname) ));
}
-#endif // wxUSE_FONTDLG
-
-#endif // GPE
+#endif // wxUSE_FONTDLG && !defined(__WXGPE__)