X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1a5a83677555023d476401bab5809a1107222c74..2845ddc25c401eab92825563a27aade46f7cfe3d:/src/generic/fontdlgg.cpp

diff --git a/src/generic/fontdlgg.cpp b/src/generic/fontdlgg.cpp
index 269f389d52..5a449ab8f7 100644
--- a/src/generic/fontdlgg.cpp
+++ b/src/generic/fontdlgg.cpp
@@ -188,38 +188,51 @@ void wxGenericFontDialog::CreateWidgets(void)
 {
   wxBeginBusyCursor();
 
-  fontRect.x = 5;
+  fontRect.x = 10;
 #ifdef __X__
   fontRect.y = 125;
 #else
   fontRect.y = 115;
 #endif
-  fontRect.width = 350;
+  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" };
-*/
-  static wxString families[] = { "Roman", "Decorative", "Modern", "Script", "Swiss" };
-  static wxString styles[] = { "Normal", "Italic", "Slant" };
-  static wxString weights[] = { "Normal", "Light", "Bold" };
-
+  /*
+    static char *families[] = { "Roman", "Decorative", "Modern", "Script", "Swiss" };
+    static char *styles[] = { "Normal", "Italic", "Slant" };
+    static char *weights[] = { "Normal", "Light", "Bold" };
+  */
+  
+  wxString
+     *families = new wxString[5],
+     *styles = new wxString[3],
+     *weights = new wxString[3];
+  families[0] =  _("Roman");
+  families[1] = _("Decorative");
+  families[2] = _("Modern");
+  families[3] = _("Script");
+  families[4] = _("Swiss" );
+  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(140, 10), wxSize(120, -1), 3, styles);
-  weightChoice = new wxChoice(this, wxID_FONT_WEIGHT, wxPoint(270, 10), wxSize(120, -1), 3, weights);
+  styleChoice = new wxChoice(this, wxID_FONT_STYLE, wxPoint(160, 10), wxSize(120, -1), 3, styles);
+  weightChoice = new wxChoice(this, wxID_FONT_WEIGHT, wxPoint(310, 10), wxSize(120, -1), 3, weights);
 
   colourChoice = new wxChoice(this, wxID_FONT_COLOUR, wxPoint(10, 40), wxSize(190, -1), NUM_COLS, wxColourDialogNames);
-#ifdef __MOTIF__
+#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[40];
+  wxString *pointSizes = new wxString[40];
   int i;
   for ( i = 0; i < 40; i++)
   {
@@ -228,8 +241,8 @@ void wxGenericFontDialog::CreateWidgets(void)
 	pointSizes[i] = buf;
   }
 
-  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));
+  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
@@ -241,10 +254,10 @@ void wxGenericFontDialog::CreateWidgets(void)
 
   fontRect.y+=y+5; //NL mod
 
-  int by = (fontRect.y + fontRect.height + 5);
+  int by = (fontRect.y + fontRect.height + 10);
 
-  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(220, by), wxSize(100,-1));
+  (void) new wxButton(this, wxID_OK, _("Cancel"), wxPoint(340, by), wxSize(100,-1));
 
   familyChoice->SetStringSelection( wxFontFamilyIntToString(dialogFont.GetFamily()) );
   styleChoice->SetStringSelection(wxFontStyleIntToString(dialogFont.GetStyle()));
@@ -257,12 +270,16 @@ void wxGenericFontDialog::CreateWidgets(void)
 
   okButton->SetDefault();
 
-  SetClientSize(400, by + 30);
+  SetClientSize(450, by + 40);
 
   Centre(wxBOTH);
 
   wxEndBusyCursor();
-  
+
+  delete[] families;
+  delete[] styles;
+  delete[] weights;
+  delete[] pointSizes;
   m_useEvents = TRUE;
 }
 
@@ -318,16 +335,20 @@ 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());
+  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 = atoi(pointSizeChoice->GetStringSelection());
   int fontUnderline = underLineCheckBox->GetValue();
 
   dialogFont = wxFont(fontSize, fontFamily, fontStyle, fontWeight, (fontUnderline != 0));
   if (colourChoice->GetStringSelection() != "")
   {
-    wxColour *col = wxTheColourDatabase->FindColour(colourChoice->GetStringSelection());
+    wxColour *col = (wxColour*) NULL;
+    col = wxTheColourDatabase->FindColour(colourChoice->GetStringSelection());
     if (col)
     {
       fontData.fontColour = *col;