Some more wxMotif improvements: DrawIcon fixed; generic notebook

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

diff --git a/src/generic/fontdlgg.cpp b/src/generic/fontdlgg.cpp
index a6c2e46fc1a3291e76e09b04495b99f616d13161..191f62517d022064ca4783437f5d2307ab23aa56 100644 (file)
--- a/src/generic/fontdlgg.cpp
+++ b/src/generic/fontdlgg.cpp
@@ -188,13 +188,13 @@ void wxGenericFontDialog::CreateWidgets(void)
 {
   wxBeginBusyCursor();
 
 {
   wxBeginBusyCursor();
 

-  fontRect.x = 5;
+  fontRect.x = 10;

 #ifdef __X__
   fontRect.y = 125;
 #else
   fontRect.y = 115;
 #endif
 #ifdef __X__
   fontRect.y = 125;
 #else
   fontRect.y = 115;
 #endif

-  fontRect.width = 350;
+  fontRect.width = 430;

   fontRect.height = 100;
 
   /*
   fontRect.height = 100;
 
   /*


@@ -226,7 +226,7 @@ void wxGenericFontDialog::CreateWidgets(void)
   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);
   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
   // 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


@@ -254,10 +254,10 @@ void wxGenericFontDialog::CreateWidgets(void)
 
   fontRect.y+=y+5; //NL mod
 
 
   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()));
 
   familyChoice->SetStringSelection( wxFontFamilyIntToString(dialogFont.GetFamily()) );
   styleChoice->SetStringSelection(wxFontStyleIntToString(dialogFont.GetStyle()));