fixed crash on invalid data (patch 1039453)

[wxWidgets.git] / src / generic / fontdlgg.cpp

diff --git a/src/generic/fontdlgg.cpp b/src/generic/fontdlgg.cpp
index 91ad7da07bd6cb110540dfa953e4a69b0e313aeb..1766bf81beff079d758b1142f0fb4489236daefb 100644 (file)
--- a/src/generic/fontdlgg.cpp
+++ b/src/generic/fontdlgg.cpp
@@ -1,15 +1,15 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        fontdlgg.cpp
+// Name:        src/generic/fontdlgg.cpp

 // Purpose:     Generic font dialog
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Purpose:     Generic font dialog
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$

-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:     wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence

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

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "fontdlgg.h"
 #endif
 
 #pragma implementation "fontdlgg.h"
 #endif
 


@@ -20,27 +20,77 @@
 #pragma hdrstop
 #endif
 
 #pragma hdrstop
 #endif
 

-#if wxUSE_FONTDLG && (!defined(__WXGTK__) || defined(__WXUNIVERSAL__))
+#if wxUSE_FONTDLG && (!defined(__WXGTK__) || defined(__WXGPE__) || defined(__WXUNIVERSAL__))

 
 #ifndef WX_PRECOMP
 
 #ifndef WX_PRECOMP

-#include <stdio.h>
-#include "wx/utils.h"
-#include "wx/dialog.h"
-#include "wx/listbox.h"
-#include "wx/button.h"
-#include "wx/stattext.h"
-#include "wx/layout.h"
-#include "wx/dcclient.h"
-#include "wx/choice.h"
-#include "wx/checkbox.h"
-#include "wx/intl.h"
+    #include <stdio.h>
+    #include "wx/utils.h"
+    #include "wx/dialog.h"
+    #include "wx/listbox.h"
+    #include "wx/button.h"
+    #include "wx/stattext.h"
+    #include "wx/layout.h"
+    #include "wx/dcclient.h"
+    #include "wx/choice.h"
+    #include "wx/checkbox.h"
+    #include "wx/intl.h"

 #endif
 
 #include <string.h>
 #include <stdlib.h>
 
 #include "wx/cmndata.h"
 #endif
 
 #include <string.h>
 #include <stdlib.h>
 
 #include "wx/cmndata.h"

+#include "wx/sizer.h"
+#include "wx/fontdlg.h"

 #include "wx/generic/fontdlgg.h"
 #include "wx/generic/fontdlgg.h"

+#include "wx/settings.h"
+
+//-----------------------------------------------------------------------------
+// helper class - wxFontPreviewer
+//-----------------------------------------------------------------------------
+
+class WXDLLEXPORT wxFontPreviewer : public wxWindow
+{
+public:
+    wxFontPreviewer(wxWindow *parent) : wxWindow(parent, wxID_ANY) {}
+
+private:
+    void OnPaint(wxPaintEvent& event);
+    DECLARE_EVENT_TABLE()
+};
+
+BEGIN_EVENT_TABLE(wxFontPreviewer, wxWindow)
+    EVT_PAINT(wxFontPreviewer::OnPaint)
+END_EVENT_TABLE()
+
+void wxFontPreviewer::OnPaint(wxPaintEvent& WXUNUSED(event))
+{
+    wxPaintDC dc(this);
+
+    wxSize size = GetSize();
+    wxFont font = GetFont();
+
+    dc.SetPen(*wxBLACK_PEN);
+    dc.SetBrush(*wxWHITE_BRUSH);
+    dc.DrawRectangle(0, 0, size.x, size.y);
+
+    if ( font.Ok() )
+    {
+        dc.SetFont(font);
+        // Calculate vertical centre
+        long w, h;
+        dc.GetTextExtent( wxT("X"), &w, &h);
+        dc.SetTextForeground(GetForegroundColour());
+        dc.SetClippingRegion(2, 2, size.x-4, size.y-4);
+        dc.DrawText(_("ABCDEFGabcdefg12345"),
+                     10, size.y/2 - h/2);
+        dc.DestroyClippingRegion();
+    }
+}
+
+//-----------------------------------------------------------------------------
+// wxGenericFontDialog
+//-----------------------------------------------------------------------------

 
 IMPLEMENT_DYNAMIC_CLASS(wxGenericFontDialog, wxDialog)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxGenericFontDialog, wxDialog)
 


@@ -51,7 +101,6 @@ BEGIN_EVENT_TABLE(wxGenericFontDialog, wxDialog)
     EVT_CHOICE(wxID_FONT_FAMILY, wxGenericFontDialog::OnChangeFont)
     EVT_CHOICE(wxID_FONT_COLOUR, wxGenericFontDialog::OnChangeFont)
     EVT_CHOICE(wxID_FONT_SIZE, wxGenericFontDialog::OnChangeFont)
     EVT_CHOICE(wxID_FONT_FAMILY, wxGenericFontDialog::OnChangeFont)
     EVT_CHOICE(wxID_FONT_COLOUR, wxGenericFontDialog::OnChangeFont)
     EVT_CHOICE(wxID_FONT_SIZE, wxGenericFontDialog::OnChangeFont)

-    EVT_PAINT(wxGenericFontDialog::OnPaint)

     EVT_CLOSE(wxGenericFontDialog::OnCloseWindow)
 END_EVENT_TABLE()
 
     EVT_CLOSE(wxGenericFontDialog::OnCloseWindow)
 END_EVENT_TABLE()
 


@@ -116,250 +165,297 @@ static wxString wxColourDialogNames[NUM_COLS]={wxT("ORANGE"),
  * Generic wxFontDialog
  */
 
  * Generic wxFontDialog
  */
 

-wxGenericFontDialog::wxGenericFontDialog(void)
-{
-  m_useEvents = FALSE;
-  dialogParent = NULL;
-}
-
-wxGenericFontDialog::wxGenericFontDialog(wxWindow *parent, wxFontData *data):
-  wxDialog(parent, -1, _("Font"), wxPoint(0, 0), wxSize(600, 600), wxDEFAULT_DIALOG_STYLE|wxDIALOG_MODAL)
+void wxGenericFontDialog::Init()

 {
 {

-  m_useEvents = FALSE;
-  Create(parent, data);
+  m_useEvents = false;
+  m_previewer = NULL;
+  Create( m_parent ) ;

 }
 
 }
 

-wxGenericFontDialog::~wxGenericFontDialog(void)
+wxGenericFontDialog::~wxGenericFontDialog()

 {
 }
 
 void wxGenericFontDialog::OnCloseWindow(wxCloseEvent& WXUNUSED(event))
 {
 {
 }
 
 void wxGenericFontDialog::OnCloseWindow(wxCloseEvent& WXUNUSED(event))
 {

-  EndModal(wxID_CANCEL);
+    EndModal(wxID_CANCEL);

 }
 
 }
 

-bool wxGenericFontDialog::Create(wxWindow *parent, wxFontData *data)
+bool wxGenericFontDialog::DoCreate(wxWindow *parent)

 {
 {

-  dialogParent = parent;
+    if ( !wxDialog::Create( parent , wxID_ANY , _T("Choose Font") , wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE,
+        _T("fontdialog") ) )
+    {
+        wxFAIL_MSG( wxT("wxFontDialog creation failed") );
+        return false;
+    }

 
 

-  if (data)
-    fontData = *data;
+    InitializeFont();
+    CreateWidgets();

 
 

-  InitializeFont();
-  CreateWidgets();
+    // sets initial font in preview area
+    wxCommandEvent dummy;
+    OnChangeFont(dummy);

 
 

-  return TRUE;
+    return true;

 }
 
 }
 

-int wxGenericFontDialog::ShowModal(void)
+int wxGenericFontDialog::ShowModal()

 {
 {

-  int ret = wxDialog::ShowModal();
+    int ret = wxDialog::ShowModal();

 
     if (ret != wxID_CANCEL)
     {
 
     if (ret != wxID_CANCEL)
     {

-      fontData.chosenFont = dialogFont;
+      m_fontData.m_chosenFont = dialogFont;

     }
 
     return ret;
 }
 
     }
 
     return ret;
 }
 

+// This should be application-settable
+static bool ShowToolTips() { return false; }

 
 

-void wxGenericFontDialog::OnPaint(wxPaintEvent& WXUNUSED(event))
+void wxGenericFontDialog::CreateWidgets()

 {
 {

-  wxPaintDC dc(this);
-  PaintFontBackground(dc);
-  PaintFont(dc);
-}
-
-/*
-static void wxGenericChangeFontText(wxTextCtrl& text, wxCommandEvent& event)
-{
-  if (event.GetEventType() == wxEVENT_TYPE_TEXT_ENTER_COMMAND)
-  {
-    wxGenericFontDialog *dialog = (wxGenericFontDialog *)text.GetParent();
-    dialog->OnChangeFont();
-  }
-}
-*/
-
-void wxGenericFontDialog::CreateWidgets(void)
-{
-  wxBeginBusyCursor();
-
-  fontRect.x = 10;
-#ifdef __X__
-  fontRect.y = 125;
-#else
-  fontRect.y = 115;
-#endif
-  fontRect.width = 430;
-  fontRect.height = 100;
-
-  /*
-    static char *families[] = { "Roman", "Decorative", "Modern", "Script", "Swiss" };
-    static char *styles[] = { "Normal", "Italic", "Slant" };
-    static char *weights[] = { "Normal", "Light", "Bold" };
-  */
-
-  wxString
+    wxString

      *families = new wxString[6],
      *styles = new wxString[3],
      *weights = new wxString[3];
      *families = new wxString[6],
      *styles = new wxString[3],
      *weights = new wxString[3];

-  families[0] =  _("Roman");
-  families[1] = _("Decorative");
-  families[2] = _("Modern");
-  families[3] = _("Script");
-  families[4] = _("Swiss" );
-  families[5] = _("Teletype" );
-  styles[0] = _("Normal");
-  styles[1] = _("Italic");
-  styles[2] = _("Slant");
-  weights[0] = _("Normal");
-  weights[1] = _("Light");
-  weights[2] = _("Bold");
-
-  int x=-1;
-  int y=40;
-  familyChoice = new wxChoice(this, wxID_FONT_FAMILY, wxPoint(10, 10), wxSize(120, -1), 5, families);
-  styleChoice = new wxChoice(this, wxID_FONT_STYLE, wxPoint(170, 10), wxSize(120, -1), 3, styles);
-  weightChoice = new wxChoice(this, wxID_FONT_WEIGHT, wxPoint(330, 10), wxSize(120, -1), 3, weights);
-
-  colourChoice = new wxChoice(this, wxID_FONT_COLOUR, wxPoint(10, 40), wxSize(180, -1), NUM_COLS, wxColourDialogNames);
-#if 0 // def __WXMOTIF__ // TODO: This necessary now?
-  // We want the pointSizeText to line up on the y axis with the colourChoice
-  colourChoice->GetPosition(&fontRect.x, &y); //NL mod
-  y+=3;    //NL mod
-#endif
-
-  wxString *pointSizes = new wxString[40];
-  int i;
-  for ( i = 0; i < 40; i++)
-  {
-    char buf[5];
-    sprintf(buf, "%d", i + 1);
-    pointSizes[i] = buf;
-  }
-
-  pointSizeChoice = new wxChoice(this, wxID_FONT_SIZE, wxPoint(230, y), wxSize(50, -1), 40, pointSizes);
-  underLineCheckBox = new wxCheckBox(this, wxID_FONT_UNDERLINE, _("Underline"), wxPoint(320, y));
-
-  int rectY;
-  pointSizeChoice->GetPosition(&x, &rectY); //NL mod
-  fontRect.y = rectY;
-  pointSizeChoice->GetSize(&x, &y); //NL mod
-
-  // Calculate the position of the bottom of the pointSizeChoice, and place
-  // the fontRect there  (+5 for a nice gap)
-
-  fontRect.y+=y+5; //NL mod
-
-  int by = (fontRect.y + fontRect.height + 15);
-
-  wxButton *okButton = new wxButton(this, wxID_OK, _("OK"), wxPoint(230, by), wxSize(75,-1));
-  (void) new wxButton(this, wxID_OK, _("Cancel"), wxPoint(330, by), wxSize(75,-1));
-
-  familyChoice->SetStringSelection( wxFontFamilyIntToString(dialogFont.GetFamily()) );
-  styleChoice->SetStringSelection(wxFontStyleIntToString(dialogFont.GetStyle()));
-  weightChoice->SetStringSelection(wxFontWeightIntToString(dialogFont.GetWeight()));
-  wxString name(wxTheColourDatabase->FindName(fontData.fontColour));
-  colourChoice->SetStringSelection(name);
-
-  underLineCheckBox->SetValue(dialogFont.GetUnderlined());
-  pointSizeChoice->SetSelection(dialogFont.GetPointSize()-1);
+    families[0] =  _("Roman");
+    families[1] = _("Decorative");
+    families[2] = _("Modern");
+    families[3] = _("Script");
+    families[4] = _("Swiss" );
+    families[5] = _("Teletype" );
+    styles[0] = _("Normal");
+    styles[1] = _("Italic");
+    styles[2] = _("Slant");
+    weights[0] = _("Normal");
+    weights[1] = _("Light");
+    weights[2] = _("Bold");
+
+    wxString *pointSizes = new wxString[40];
+    int i;
+    for ( i = 0; i < 40; i++)
+    {
+        wxChar buf[5];
+        wxSprintf(buf, wxT("%d"), i + 1);
+        pointSizes[i] = buf;
+    }

 
 

-  okButton->SetDefault();
+    // layout

 
 

-  //  SetClientSize(450, by + 40);
-  Fit();
+    bool is_pda = (wxSystemSettings::GetScreenType() <= wxSYS_SCREEN_PDA);
+    int noCols, noRows;
+    if (is_pda)
+    {
+        noCols = 2; noRows = 3;
+    }
+    else
+    {
+        noCols = 3; noRows = 2;
+    }

 
 

-  Centre(wxBOTH);
+    wxBoxSizer* itemBoxSizer2 = new wxBoxSizer(wxVERTICAL);
+    this->SetSizer(itemBoxSizer2);
+    this->SetAutoLayout(TRUE);
+    
+    wxBoxSizer* itemBoxSizer3 = new wxBoxSizer(wxVERTICAL);
+    itemBoxSizer2->Add(itemBoxSizer3, 1, wxGROW|wxALL, 5);
+
+    wxFlexGridSizer* itemGridSizer4 = new wxFlexGridSizer(noRows, noCols, 0, 0);
+    itemBoxSizer3->Add(itemGridSizer4, 0, wxGROW, 5);
+
+    wxBoxSizer* itemBoxSizer5 = new wxBoxSizer(wxVERTICAL);
+    itemGridSizer4->Add(itemBoxSizer5, 0, wxALIGN_CENTER_HORIZONTAL|wxGROW, 5);
+    wxStaticText* itemStaticText6 = new wxStaticText( this, wxID_STATIC, _("&Font family:"), wxDefaultPosition, wxDefaultSize, 0 );
+    itemBoxSizer5->Add(itemStaticText6, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxTOP|wxADJUST_MINSIZE, 5);
+
+    wxChoice* itemChoice7 = new wxChoice( this, wxID_FONT_FAMILY, wxDefaultPosition, wxDefaultSize, 5, families, 0 );
+    itemChoice7->SetHelpText(_("The font family."));
+    if (ShowToolTips())
+        itemChoice7->SetToolTip(_("The font family."));
+    itemBoxSizer5->Add(itemChoice7, 0, wxALIGN_LEFT|wxALL, 5);
+
+    wxBoxSizer* itemBoxSizer8 = new wxBoxSizer(wxVERTICAL);
+    itemGridSizer4->Add(itemBoxSizer8, 0, wxALIGN_CENTER_HORIZONTAL|wxGROW, 5);
+    wxStaticText* itemStaticText9 = new wxStaticText( this, wxID_STATIC, _("&Style:"), wxDefaultPosition, wxDefaultSize, 0 );
+    itemBoxSizer8->Add(itemStaticText9, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxTOP|wxADJUST_MINSIZE, 5);
+
+    wxChoice* itemChoice10 = new wxChoice( this, wxID_FONT_STYLE, wxDefaultPosition, wxDefaultSize, 3, styles, 0 );
+    itemChoice10->SetHelpText(_("The font style."));
+    if (ShowToolTips())
+        itemChoice10->SetToolTip(_("The font style."));
+    itemBoxSizer8->Add(itemChoice10, 0, wxALIGN_LEFT|wxALL, 5);
+
+    wxBoxSizer* itemBoxSizer11 = new wxBoxSizer(wxVERTICAL);
+    itemGridSizer4->Add(itemBoxSizer11, 0, wxALIGN_CENTER_HORIZONTAL|wxGROW, 5);
+    wxStaticText* itemStaticText12 = new wxStaticText( this, wxID_STATIC, _("&Weight:"), wxDefaultPosition, wxDefaultSize, 0 );
+    itemBoxSizer11->Add(itemStaticText12, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxTOP|wxADJUST_MINSIZE, 5);
+
+    wxChoice* itemChoice13 = new wxChoice( this, wxID_FONT_WEIGHT, wxDefaultPosition, wxDefaultSize, 3, weights, 0 );
+    itemChoice13->SetHelpText(_("The font weight."));
+    if (ShowToolTips())
+        itemChoice13->SetToolTip(_("The font weight."));
+    itemBoxSizer11->Add(itemChoice13, 0, wxALIGN_LEFT|wxALL, 5);
+
+    wxBoxSizer* itemBoxSizer14 = new wxBoxSizer(wxVERTICAL);
+    itemGridSizer4->Add(itemBoxSizer14, 0, wxALIGN_CENTER_HORIZONTAL|wxGROW, 5);
+    wxStaticText* itemStaticText15 = new wxStaticText( this, wxID_STATIC, _("C&olour:"), wxDefaultPosition, wxDefaultSize, 0 );
+    itemBoxSizer14->Add(itemStaticText15, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxTOP|wxADJUST_MINSIZE, 5);
+
+    wxChoice* itemChoice16 = new wxChoice( this, wxID_FONT_COLOUR, wxDefaultPosition, wxDefaultSize, NUM_COLS, wxColourDialogNames, 0 );
+    itemChoice16->SetHelpText(_("The font colour."));
+    if (ShowToolTips())
+        itemChoice16->SetToolTip(_("The font colour."));
+    itemBoxSizer14->Add(itemChoice16, 0, wxALIGN_LEFT|wxALL, 5);
+
+    wxBoxSizer* itemBoxSizer17 = new wxBoxSizer(wxVERTICAL);
+    itemGridSizer4->Add(itemBoxSizer17, 0, wxALIGN_CENTER_HORIZONTAL|wxGROW, 5);
+    wxStaticText* itemStaticText18 = new wxStaticText( this, wxID_STATIC, _("&Point size:"), wxDefaultPosition, wxDefaultSize, 0 );
+    itemBoxSizer17->Add(itemStaticText18, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxTOP|wxADJUST_MINSIZE, 5);
+
+    wxChoice* itemChoice19 = new wxChoice( this, wxID_FONT_SIZE, wxDefaultPosition, wxDefaultSize, 40, pointSizes, 0 );
+    itemChoice19->SetHelpText(_("The font point size."));
+    if (ShowToolTips())
+        itemChoice19->SetToolTip(_("The font point size."));
+    itemBoxSizer17->Add(itemChoice19, 0, wxALIGN_LEFT|wxALL, 5);
+
+    wxBoxSizer* itemBoxSizer20 = new wxBoxSizer(wxVERTICAL);
+    itemGridSizer4->Add(itemBoxSizer20, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL, 5);
+    wxCheckBox* itemCheckBox21 = new wxCheckBox( this, wxID_FONT_UNDERLINE, _("&Underline"), wxDefaultPosition, wxDefaultSize, 0 );
+    itemCheckBox21->SetValue(FALSE);
+    itemCheckBox21->SetHelpText(_("Whether the font is underlined."));
+    if (ShowToolTips())
+        itemCheckBox21->SetToolTip(_("Whether the font is underlined."));
+    itemBoxSizer20->Add(itemCheckBox21, 0, wxALIGN_LEFT|wxALL, 5);
+
+    itemBoxSizer3->Add(5, 5, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5);
+
+    wxStaticText* itemStaticText23 = new wxStaticText( this, wxID_STATIC, _("Preview:"), wxDefaultPosition, wxDefaultSize, 0 );
+    itemBoxSizer3->Add(itemStaticText23, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxTOP|wxADJUST_MINSIZE, 5);
+
+    wxFontPreviewer* itemWindow24 = new wxFontPreviewer( this );
+    m_previewer = itemWindow24;
+    itemWindow24->SetHelpText(_("Shows the font preview."));
+    if (ShowToolTips())
+        itemWindow24->SetToolTip(_("Shows the font preview."));
+    itemBoxSizer3->Add(itemWindow24, 0, wxGROW|wxALL, 5);
+
+    wxBoxSizer* itemBoxSizer25 = new wxBoxSizer(wxHORIZONTAL);
+    itemBoxSizer3->Add(itemBoxSizer25, 0, wxGROW, 5);
+    itemBoxSizer25->Add(5, 5, 1, wxGROW|wxALL, 5);
+
+#ifdef __WXMAC__
+    wxButton* itemButton28 = new wxButton( this, wxID_CANCEL, _("&Cancel"), wxDefaultPosition, wxDefaultSize, 0 );
+    if (ShowToolTips())
+        itemButton28->SetToolTip(_("Click to cancel the font selection."));
+    itemBoxSizer25->Add(itemButton28, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
+
+    wxButton* itemButton27 = new wxButton( this, wxID_OK, _("&OK"), wxDefaultPosition, wxDefaultSize, 0 );
+    itemButton27->SetDefault();
+    itemButton27->SetHelpText(_("Click to confirm the font selection."));
+    if (ShowToolTips())
+        itemButton27->SetToolTip(_("Click to confirm the font selection."));
+    itemBoxSizer25->Add(itemButton27, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
+#else
+    wxButton* itemButton27 = new wxButton( this, wxID_OK, _("&OK"), wxDefaultPosition, wxDefaultSize, 0 );
+    itemButton27->SetDefault();
+    itemButton27->SetHelpText(_("Click to confirm the font selection."));
+    if (ShowToolTips())
+        itemButton27->SetToolTip(_("Click to confirm the font selection."));
+    itemBoxSizer25->Add(itemButton27, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
+
+    wxButton* itemButton28 = new wxButton( this, wxID_CANCEL, _("&Cancel"), wxDefaultPosition, wxDefaultSize, 0 );
+    if (ShowToolTips())
+        itemButton28->SetToolTip(_("Click to cancel the font selection."));
+    itemBoxSizer25->Add(itemButton28, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
+#endif

 
 

-  wxEndBusyCursor();
+    familyChoice = (wxChoice*) FindWindow(wxID_FONT_FAMILY);
+    styleChoice = (wxChoice*) FindWindow(wxID_FONT_STYLE);
+    weightChoice = (wxChoice*) FindWindow(wxID_FONT_WEIGHT);
+    colourChoice = (wxChoice*) FindWindow(wxID_FONT_COLOUR);
+    pointSizeChoice = (wxChoice*) FindWindow(wxID_FONT_SIZE);
+    underLineCheckBox = (wxCheckBox*) FindWindow(wxID_FONT_UNDERLINE);
+    
+    familyChoice->SetStringSelection( wxFontFamilyIntToString(dialogFont.GetFamily()) );
+    styleChoice->SetStringSelection(wxFontStyleIntToString(dialogFont.GetStyle()));
+    weightChoice->SetStringSelection(wxFontWeightIntToString(dialogFont.GetWeight()));
+    wxString name(wxTheColourDatabase->FindName(m_fontData.GetColour()));
+    if (name.length())
+        colourChoice->SetStringSelection(name);
+    else
+        colourChoice->SetStringSelection(wxT("BLACK"));
+    
+    underLineCheckBox->SetValue(dialogFont.GetUnderlined());
+    pointSizeChoice->SetSelection(dialogFont.GetPointSize()-1);
+
+    GetSizer()->SetItemMinSize(m_previewer, 430, 100);
+    GetSizer()->SetSizeHints(this);
+    GetSizer()->Fit(this);    
+
+    Centre(wxBOTH);
+
+    delete[] families;
+    delete[] styles;
+    delete[] weights;
+    delete[] pointSizes;
+
+    // Don't block events any more
+    m_useEvents = true;

 
 

-  delete[] families;
-  delete[] styles;
-  delete[] weights;
-  delete[] pointSizes;
-  m_useEvents = TRUE;

 }
 
 }
 

-void wxGenericFontDialog::InitializeFont(void)
+void wxGenericFontDialog::InitializeFont()

 {
 {

-  int fontFamily = wxSWISS;
-  int fontWeight = wxNORMAL;
-  int fontStyle = wxNORMAL;
-  int fontSize = 12;
-  int fontUnderline = FALSE;
-  if (fontData.initialFont.Ok())
-  {
-    fontFamily = fontData.initialFont.GetFamily();
-    fontWeight = fontData.initialFont.GetWeight();
-    fontStyle = fontData.initialFont.GetStyle();
-    fontSize = fontData.initialFont.GetPointSize();
-    fontUnderline = fontData.initialFont.GetUnderlined();
-  }
-  dialogFont = wxFont(fontSize, fontFamily, fontStyle, fontWeight, (fontUnderline != 0));
-}
+    int fontFamily = wxSWISS;
+    int fontWeight = wxNORMAL;
+    int fontStyle = wxNORMAL;
+    int fontSize = 12;
+    bool fontUnderline = false;

 
 

-void wxGenericFontDialog::PaintFontBackground(wxDC& dc)
-{
-  dc.BeginDrawing();
+    if (m_fontData.m_initialFont.Ok())
+    {
+        fontFamily = m_fontData.m_initialFont.GetFamily();
+        fontWeight = m_fontData.m_initialFont.GetWeight();
+        fontStyle = m_fontData.m_initialFont.GetStyle();
+        fontSize = m_fontData.m_initialFont.GetPointSize();
+        fontUnderline = m_fontData.m_initialFont.GetUnderlined();
+    }

 
 

-  dc.SetPen(*wxBLACK_PEN);
-  dc.SetBrush(*wxWHITE_BRUSH);
-  dc.DrawRectangle( fontRect.x, fontRect.y, fontRect.width, fontRect.height);
-  dc.EndDrawing();
-}
+    dialogFont = wxFont(fontSize, fontFamily, fontStyle,
+        fontWeight, fontUnderline);

 
 

-void wxGenericFontDialog::PaintFont(wxDC& dc)
-{
-  dc.BeginDrawing();
-  if (dialogFont.Ok())
-  {
-    dc.SetFont(dialogFont);
-    // Calculate vertical centre
-    long w, h;
-    dc.GetTextExtent("X", &w, &h);
-    float cx = (float)(fontRect.x + 10);
-    float cy = (float)(fontRect.y + (fontRect.height/2.0) - (h/2.0));
-    dc.SetTextForeground(fontData.fontColour);
-    dc.SetClippingRegion( fontRect.x, fontRect.y, (long)(fontRect.width-2.0), (long)(fontRect.height-2.0));
-    dc.DrawText(_("ABCDEFGabcdefg12345"), (long)cx, (long)cy);
-    dc.DestroyClippingRegion();
-    dc.SetFont(wxNullFont);
-  }
-  dc.EndDrawing();
+    if (m_previewer)
+        m_previewer->SetFont(dialogFont);

 }
 
 void wxGenericFontDialog::OnChangeFont(wxCommandEvent& WXUNUSED(event))
 {
 }
 
 void wxGenericFontDialog::OnChangeFont(wxCommandEvent& WXUNUSED(event))
 {

-  if (!m_useEvents) return;
-
-  int fontFamily = 0;  /* shut up buggy egcs warnings */
-  fontFamily = wxFontFamilyStringToInt(WXSTRINGCAST familyChoice->GetStringSelection());
-  int fontWeight = 0;
-  fontWeight = wxFontWeightStringToInt(WXSTRINGCAST weightChoice->GetStringSelection());
-  int fontStyle = 0;
-  fontStyle = wxFontStyleStringToInt(WXSTRINGCAST styleChoice->GetStringSelection());
-  int fontSize = wxAtoi(pointSizeChoice->GetStringSelection());
-  int fontUnderline = underLineCheckBox->GetValue();
-
-  dialogFont = wxFont(fontSize, fontFamily, fontStyle, fontWeight, (fontUnderline != 0));
-  if (colourChoice->GetStringSelection() != wxT(""))
-  {
-    wxColour *col = (wxColour*) NULL;
-    col = wxTheColourDatabase->FindColour(colourChoice->GetStringSelection());
-    if (col)
+    if (!m_useEvents) return;
+
+    int fontFamily = wxFontFamilyStringToInt(WXSTRINGCAST familyChoice->GetStringSelection());
+    int fontWeight = wxFontWeightStringToInt(WXSTRINGCAST weightChoice->GetStringSelection());
+    int fontStyle = wxFontStyleStringToInt(WXSTRINGCAST styleChoice->GetStringSelection());
+    int fontSize = wxAtoi(pointSizeChoice->GetStringSelection());
+    int fontUnderline = underLineCheckBox->GetValue();
+
+    dialogFont = wxFont(fontSize, fontFamily, fontStyle, fontWeight, (fontUnderline != 0));
+    m_previewer->SetFont(dialogFont);
+    if ( !colourChoice->GetStringSelection().empty() )

     {
     {

-      fontData.fontColour = *col;
+        wxColour col = wxTheColourDatabase->Find(colourChoice->GetStringSelection());
+        if (col.Ok())
+        {
+            m_fontData.m_fontColour = col;
+            m_previewer->SetForegroundColour(col);
+        }

     }
     }

-  }
-  wxClientDC dc(this);
-  PaintFontBackground(dc);
-  PaintFont(dc);
+    m_previewer->Refresh();

 }
 
 }
 

-wxChar *wxFontWeightIntToString(int weight)
+const wxChar *wxFontWeightIntToString(int weight)

 {
   switch (weight)
   {
 {
   switch (weight)
   {


@@ -373,7 +469,7 @@ wxChar *wxFontWeightIntToString(int weight)
   }
 }
 
   }
 }
 

-wxChar *wxFontStyleIntToString(int style)
+const wxChar *wxFontStyleIntToString(int style)

 {
   switch (style)
   {
 {
   switch (style)
   {


@@ -387,7 +483,7 @@ wxChar *wxFontStyleIntToString(int style)
   }
 }
 
   }
 }
 

-wxChar *wxFontFamilyIntToString(int family)
+const wxChar *wxFontFamilyIntToString(int family)

 {
   switch (family)
   {
 {
   switch (family)
   {