projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Blind fixes for Mac project files (version number, missing cpp files)
[wxWidgets.git]
/
src
/
gtk
/
fontdlg.cpp
diff --git
a/src/gtk/fontdlg.cpp
b/src/gtk/fontdlg.cpp
index 4582a5c0022fbdaa5ebd77da726096c963615d9d..fe2fe16ec3c173d4a55d9e048c029b715942e039 100644
(file)
--- a/
src/gtk/fontdlg.cpp
+++ b/
src/gtk/fontdlg.cpp
@@
-7,14
+7,19
@@
// 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
+#ifndef __WXGPE__
+
#include "wx/fontutil.h"
#include "wx/fontdlg.h"
#include "wx/utils.h"
#include "wx/fontutil.h"
#include "wx/fontdlg.h"
#include "wx/utils.h"
@@
-64,6
+69,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,12
+79,10
@@
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);
+ dialog->SetChosenFont( fontname);
g_free( fontname );
g_free( fontname );
@@
-122,9
+127,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
+152,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
+175,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;
}
@@
-181,8
+185,10
@@
wxFontDialog::~wxFontDialog()
void wxFontDialog::SetChosenFont(const char *fontname)
{
void wxFontDialog::SetChosenFont(const char *fontname)
{
- m_fontData.SetChosenFont(wxFont(
fontname
));
+ m_fontData.SetChosenFont(wxFont(
wxString::FromAscii(fontname)
));
}
#endif // wxUSE_FONTDLG
}
#endif // wxUSE_FONTDLG
+#endif // GPE
+