centralized the handling of border styles; added borders support for wxListBox and...

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

diff --git a/src/gtk1/fontdlg.cpp b/src/gtk1/fontdlg.cpp
index f456ee444cfdbc153e0b8d86b286f0d771d8d003..982850c35ef23d0786af15c092b2114a0489a30a 100644 (file)
--- a/src/gtk1/fontdlg.cpp
+++ b/src/gtk1/fontdlg.cpp
@@ -4,13 +4,9 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling

-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "fontdlg.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -20,14 +16,14 @@
 
 #ifndef __WXGPE__
 
 
 #ifndef __WXGPE__
 

-#include "wx/fontutil.h"

 #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/msgdlg.h"
 
 #include "wx/utils.h"
 #include "wx/intl.h"
 #include "wx/debug.h"
 #include "wx/msgdlg.h"
 

-#include "wx/gtk/private.h"
+#include "wx/gtk1/private.h"

 
 //-----------------------------------------------------------------------------
 // idle system
 
 //-----------------------------------------------------------------------------
 // idle system


@@ -40,6 +36,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 )
 {


@@ -57,11 +54,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 )
 {


@@ -70,7 +69,6 @@ void gtk_fontdialog_ok_callback( GtkWidget *WXUNUSED(widget), wxFontDialog *dial
 
     GtkFontSelectionDialog *fontdlg = GTK_FONT_SELECTION_DIALOG(dialog->m_widget);
 
 
     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)


@@ -79,7 +77,6 @@ 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);
     dialog->SetChosenFont( fontname);
 
     gchar *fontname = gtk_font_selection_dialog_get_font_name(fontdlg);
     dialog->SetChosenFont( fontname);


@@ -90,11 +87,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 )
 {


@@ -105,6 +104,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


@@ -127,32 +127,27 @@ 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 ) );
 

-    int x = (gdk_screen_width () - 400) / 2;
-    int y = (gdk_screen_height () - 400) / 2;
-    gtk_widget_set_uposition( m_widget, x, y );
+    if (parent)
+        gtk_window_set_transient_for(GTK_WINDOW(m_widget),
+                                     GTK_WINDOW(parent->m_widget));

 
     GtkFontSelectionDialog *sel = GTK_FONT_SELECTION_DIALOG(m_widget);
 
     gtk_signal_connect( GTK_OBJECT(sel->ok_button), "clicked",
       GTK_SIGNAL_FUNC(gtk_fontdialog_ok_callback), (gpointer*)this );
 
 
     GtkFontSelectionDialog *sel = GTK_FONT_SELECTION_DIALOG(m_widget);
 
     gtk_signal_connect( GTK_OBJECT(sel->ok_button), "clicked",
       GTK_SIGNAL_FUNC(gtk_fontdialog_ok_callback), (gpointer*)this );
 

-#ifndef __WXGTK20__

     // strange way to internationalize
     gtk_label_set( GTK_LABEL( BUTTON_CHILD(sel->ok_button) ), _("OK") );
     // strange way to internationalize
     gtk_label_set( GTK_LABEL( BUTTON_CHILD(sel->ok_button) ), _("OK") );

-#endif

 
     gtk_signal_connect( GTK_OBJECT(sel->cancel_button), "clicked",
       GTK_SIGNAL_FUNC(gtk_fontdialog_cancel_callback), (gpointer*)this );
 
 
     gtk_signal_connect( GTK_OBJECT(sel->cancel_button), "clicked",
       GTK_SIGNAL_FUNC(gtk_fontdialog_cancel_callback), (gpointer*)this );
 

-#ifndef __WXGTK20__

     // strange way to internationalize
     gtk_label_set( GTK_LABEL( BUTTON_CHILD(sel->cancel_button) ), _("Cancel") );
     // strange way to internationalize
     gtk_label_set( GTK_LABEL( BUTTON_CHILD(sel->cancel_button) ), _("Cancel") );

-#endif

 
     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() )
     {


@@ -160,14 +155,12 @@ bool wxFontDialog::DoCreate(wxWindow *parent)
 
         if ( info )
         {
 
         if ( info )
         {

+

             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)
-            );
+
+            gtk_font_selection_dialog_set_font_name(sel, wxGTK_CONV(fontname));

         }
         else
         {
         }
         else
         {


@@ -175,7 +168,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;
 }