projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added test for wxScopeGuard
[wxWidgets.git]
/
src
/
gtk1
/
fontdlg.cpp
diff --git
a/src/gtk1/fontdlg.cpp
b/src/gtk1/fontdlg.cpp
index 3dfb008131d6bd2b6caf46d741138a183cc7325d..b2c47ed2139ea1abe5c0a977c32ec5868c976b94 100644
(file)
--- a/
src/gtk1/fontdlg.cpp
+++ b/
src/gtk1/fontdlg.cpp
@@
-7,16
+7,21
@@
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#if
def __GNUG__
+#if
defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma implementation "fontdlg.h"
#endif
#pragma implementation "fontdlg.h"
#endif
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
#include "wx/defs.h"
#if wxUSE_FONTDLG
#include "wx/defs.h"
#if wxUSE_FONTDLG
-#include "wx/fontutil.h"
+#ifndef __WXGPE__
+
#include "wx/fontdlg.h"
#include "wx/fontdlg.h"
+#include "wx/fontutil.h"
#include "wx/utils.h"
#include "wx/intl.h"
#include "wx/debug.h"
#include "wx/utils.h"
#include "wx/intl.h"
#include "wx/debug.h"
@@
-35,6
+40,7
@@
extern bool g_isIdle;
// "delete_event"
//-----------------------------------------------------------------------------
// "delete_event"
//-----------------------------------------------------------------------------
+extern "C" {
static
bool gtk_fontdialog_delete_callback( GtkWidget *WXUNUSED(widget), GdkEvent *WXUNUSED(event), wxDialog *win )
{
static
bool gtk_fontdialog_delete_callback( GtkWidget *WXUNUSED(widget), GdkEvent *WXUNUSED(event), wxDialog *win )
{
@@
-52,11
+58,13
@@
bool gtk_fontdialog_delete_callback( GtkWidget *WXUNUSED(widget), GdkEvent *WXUN
return TRUE;
}
return TRUE;
}
+}
//-----------------------------------------------------------------------------
// "clicked" for OK-button
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
// "clicked" for OK-button
//-----------------------------------------------------------------------------
+extern "C" {
static
void gtk_fontdialog_ok_callback( GtkWidget *WXUNUSED(widget), wxFontDialog *dialog )
{
static
void gtk_fontdialog_ok_callback( GtkWidget *WXUNUSED(widget), wxFontDialog *dialog )
{
@@
-64,6
+72,8
@@
void gtk_fontdialog_ok_callback( GtkWidget *WXUNUSED(widget), wxFontDialog *dial
wxapp_install_idle_handler();
GtkFontSelectionDialog *fontdlg = GTK_FONT_SELECTION_DIALOG(dialog->m_widget);
wxapp_install_idle_handler();
GtkFontSelectionDialog *fontdlg = GTK_FONT_SELECTION_DIALOG(dialog->m_widget);
+
+#ifndef __WXGTK20__
GdkFont *gfont = gtk_font_selection_dialog_get_font(fontdlg);
if (!gfont)
GdkFont *gfont = gtk_font_selection_dialog_get_font(fontdlg);
if (!gfont)
@@
-72,11
+82,9
@@
void gtk_fontdialog_ok_callback( GtkWidget *WXUNUSED(widget), wxFontDialog *dial
wxOK | wxICON_ERROR);
return;
}
wxOK | wxICON_ERROR);
return;
}
+#endif
gchar *fontname = gtk_font_selection_dialog_get_font_name(fontdlg);
gchar *fontname = gtk_font_selection_dialog_get_font_name(fontdlg);
-
- // printf( "font %s\n", fontname );
-
dialog->SetChosenFont( fontname);
g_free( fontname );
dialog->SetChosenFont( fontname);
g_free( fontname );
@@
-85,11
+93,13
@@
void gtk_fontdialog_ok_callback( GtkWidget *WXUNUSED(widget), wxFontDialog *dial
event.SetEventObject( dialog );
dialog->GetEventHandler()->ProcessEvent( event );
}
event.SetEventObject( dialog );
dialog->GetEventHandler()->ProcessEvent( event );
}
+}
//-----------------------------------------------------------------------------
// "clicked" for Cancel-button
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
// "clicked" for Cancel-button
//-----------------------------------------------------------------------------
+extern "C" {
static
void gtk_fontdialog_cancel_callback( GtkWidget *WXUNUSED(w), wxFontDialog *dialog )
{
static
void gtk_fontdialog_cancel_callback( GtkWidget *WXUNUSED(w), wxFontDialog *dialog )
{
@@
-100,6
+110,7
@@
void gtk_fontdialog_cancel_callback( GtkWidget *WXUNUSED(w), wxFontDialog *dialo
event.SetEventObject( dialog );
dialog->GetEventHandler()->ProcessEvent( event );
}
event.SetEventObject( dialog );
dialog->GetEventHandler()->ProcessEvent( event );
}
+}
//-----------------------------------------------------------------------------
// wxFontDialog
//-----------------------------------------------------------------------------
// wxFontDialog
@@
-122,9
+133,9
@@
bool wxFontDialog::DoCreate(wxWindow *parent)
wxString m_message( _("Choose font") );
m_widget = gtk_font_selection_dialog_new( wxGTK_CONV( m_message ) );
wxString m_message( _("Choose font") );
m_widget = gtk_font_selection_dialog_new( wxGTK_CONV( m_message ) );
- i
nt x = (gdk_screen_width () - 400) / 2;
- int y = (gdk_screen_height () - 400) / 2;
-
gtk_widget_set_uposition( m_widget, x, y
);
+ i
f (parent)
+ gtk_window_set_transient_for(GTK_WINDOW(m_widget),
+
GTK_WINDOW(parent->m_widget)
);
GtkFontSelectionDialog *sel = GTK_FONT_SELECTION_DIALOG(m_widget);
GtkFontSelectionDialog *sel = GTK_FONT_SELECTION_DIALOG(m_widget);
@@
-147,22
+158,22
@@
bool wxFontDialog::DoCreate(wxWindow *parent)
gtk_signal_connect( GTK_OBJECT(m_widget), "delete_event",
GTK_SIGNAL_FUNC(gtk_fontdialog_delete_callback), (gpointer)this );
gtk_signal_connect( GTK_OBJECT(m_widget), "delete_event",
GTK_SIGNAL_FUNC(gtk_fontdialog_delete_callback), (gpointer)this );
-#ifndef __WXGTK20__
wxFont font = m_fontData.GetInitialFont();
if( font.Ok() )
{
wxFont font = m_fontData.GetInitialFont();
if( font.Ok() )
{
- wxNativeFontInfo *info = font.GetNativeFontInfo();
+
const
wxNativeFontInfo *info = font.GetNativeFontInfo();
if ( info )
{
if ( info )
{
+
+#ifdef __WXGTK20__
+ const wxString& fontname = info->ToString();
+#else
const wxString& fontname = info->GetXFontName();
if ( !fontname )
font.GetInternalFont();
const wxString& fontname = info->GetXFontName();
if ( !fontname )
font.GetInternalFont();
- gtk_font_selection_dialog_set_font_name
- (
- sel,
- wxConvCurrent->cWX2MB(fontname)
- );
+#endif
+ gtk_font_selection_dialog_set_font_name(sel, wxGTK_CONV(fontname));
}
else
{
}
else
{
@@
-170,7
+181,6
@@
bool wxFontDialog::DoCreate(wxWindow *parent)
wxFAIL_MSG(_T("font is ok but no native font info?"));
}
}
wxFAIL_MSG(_T("font is ok but no native font info?"));
}
}
-#endif
return TRUE;
}
return TRUE;
}
@@
-186,3
+196,5
@@
void wxFontDialog::SetChosenFont(const char *fontname)
#endif // wxUSE_FONTDLG
#endif // wxUSE_FONTDLG
+#endif // GPE
+