X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c801d85f158c4cba50b588807daabdcbd0ed3853..ec45f8ee19190fce57180381611075d3a5b63435:/src/generic/fontdlgg.cpp?ds=sidebyside

diff --git a/src/generic/fontdlgg.cpp b/src/generic/fontdlgg.cpp
index 5d0ea78fbd..269f389d52 100644
--- a/src/generic/fontdlgg.cpp
+++ b/src/generic/fontdlgg.cpp
@@ -31,6 +31,7 @@
 #include "wx/dcclient.h"
 #include "wx/choice.h"
 #include "wx/checkbox.h"
+#include <wx/intl.h>
 #endif
 
 #include <string.h>
@@ -116,12 +117,14 @@ static wxString wxColourDialogNames[NUM_COLS]={"ORANGE",
 
 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)
+  wxDialog(parent, -1, _("Font"), wxPoint(0, 0), wxSize(600, 600), wxDEFAULT_DIALOG_STYLE|wxDIALOG_MODAL)
 {
+  m_useEvents = FALSE;
   Create(parent, data);
 }
 
@@ -226,7 +229,7 @@ void wxGenericFontDialog::CreateWidgets(void)
   }
 
   pointSizeChoice = new wxChoice(this, wxID_FONT_SIZE, wxPoint(210, y), wxSize(50, -1), 40, pointSizes);
-  underLineCheckBox = new wxCheckBox(this, wxID_FONT_UNDERLINE, "Underline", wxPoint(280, y));
+  underLineCheckBox = new wxCheckBox(this, wxID_FONT_UNDERLINE, _("Underline"), wxPoint(280, y));
 
   int rectY;
   pointSizeChoice->GetPosition(&x, &rectY); //NL mod
@@ -240,18 +243,17 @@ void wxGenericFontDialog::CreateWidgets(void)
 
   int by = (fontRect.y + fontRect.height + 5);
 
-  wxButton *okButton = new wxButton(this, wxID_OK, "OK", wxPoint(5, by));
-  (void) new wxButton(this, wxID_OK, "Cancel", wxPoint(50, by));
+  wxButton *okButton = new wxButton(this, wxID_OK, _("OK"), wxPoint(5, by));
+  (void) new wxButton(this, wxID_OK, _("Cancel"), wxPoint(50, by));
 
-  familyChoice->SetStringSelection(wxFontFamilyIntToString(dialogFont.GetFamily()));
+  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());
+  pointSizeChoice->SetSelection(dialogFont.GetPointSize()-1);
 
   okButton->SetDefault();
 
@@ -260,6 +262,8 @@ void wxGenericFontDialog::CreateWidgets(void)
   Centre(wxBOTH);
 
   wxEndBusyCursor();
+  
+  m_useEvents = TRUE;
 }
 
 void wxGenericFontDialog::InitializeFont(void)
@@ -278,7 +282,6 @@ void wxGenericFontDialog::InitializeFont(void)
     fontUnderline = fontData.initialFont.GetUnderlined();
   }
   dialogFont = wxFont(fontSize, fontFamily, fontStyle, fontWeight, (fontUnderline != 0));
-
 }
 
 void wxGenericFontDialog::PaintFontBackground(wxDC& dc)
@@ -304,7 +307,7 @@ void wxGenericFontDialog::PaintFont(wxDC& dc)
     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.DrawText(_("ABCDEFGabcdefg12345"), (long)cx, (long)cy);
     dc.DestroyClippingRegion();
 	dc.SetFont(wxNullFont);
   }
@@ -313,6 +316,8 @@ void wxGenericFontDialog::PaintFont(wxDC& dc)
 
 void wxGenericFontDialog::OnChangeFont(wxCommandEvent& WXUNUSED(event))
 {
+  if (!m_useEvents) return;
+  
   int fontFamily = wxFontFamilyStringToInt(WXSTRINGCAST familyChoice->GetStringSelection());
   int fontWeight = wxFontWeightStringToInt(WXSTRINGCAST weightChoice->GetStringSelection());
   int fontStyle = wxFontStyleStringToInt(WXSTRINGCAST styleChoice->GetStringSelection());