fixed transparency handling broken by the last commit

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

diff --git a/src/generic/fontdlgg.cpp b/src/generic/fontdlgg.cpp
index 979f05d80aaca1098ce14e3efd62aa7042a276dc..61e9a9a30e06415d3d163b426c86b6b5b7f15d43 100644 (file)
--- a/src/generic/fontdlgg.cpp
+++ b/src/generic/fontdlgg.cpp
@@ -9,10 +9,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "fontdlgg.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"
 


@@ -80,7 +76,7 @@ void wxFontPreviewer::OnPaint(wxPaintEvent& WXUNUSED(event))
     {
         dc.SetFont(font);
         // Calculate vertical centre
     {
         dc.SetFont(font);
         // Calculate vertical centre

-        long w, h;
+        long w = 0, h = 0;

         dc.GetTextExtent( wxT("X"), &w, &h);
         dc.SetTextForeground(GetForegroundColour());
         dc.SetClippingRegion(2, 2, size.x-4, size.y-4);
         dc.GetTextExtent( wxT("X"), &w, &h);
         dc.SetTextForeground(GetForegroundColour());
         dc.SetClippingRegion(2, 2, size.x-4, size.y-4);


@@ -312,7 +308,7 @@ void wxGenericFontDialog::CreateWidgets()
         if (is_pda)
             colourSize.x = 100;
 
         if (is_pda)
             colourSize.x = 100;
 

-        wxChoice* itemChoice16 = new wxChoice( this, wxID_FONT_COLOUR, wxDefaultPosition, wxDefaultSize, NUM_COLS, wxColourDialogNames, 0 );
+        wxChoice* itemChoice16 = new wxChoice( this, wxID_FONT_COLOUR, wxDefaultPosition, colourSize, NUM_COLS, wxColourDialogNames, 0 );

         itemChoice16->SetHelpText(_("The font colour."));
         if (ShowToolTips())
             itemChoice16->SetToolTip(_("The font colour."));
         itemChoice16->SetHelpText(_("The font colour."));
         if (ShowToolTips())
             itemChoice16->SetToolTip(_("The font colour."));