]> git.saurik.com Git - wxWidgets.git/blobdiff - src/generic/fontdlgg.cpp
Added style parameter to wxPopupWindow ctors so they match the Create method.
[wxWidgets.git] / src / generic / fontdlgg.cpp
index c48439da7fd685518a54d524dda9fd44b83ac2fe..91ad7da07bd6cb110540dfa953e4a69b0e313aeb 100644 (file)
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:    wxWindows license
+// Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
@@ -20,6 +20,8 @@
 #pragma hdrstop
 #endif
 
+#if wxUSE_FONTDLG && (!defined(__WXGTK__) || defined(__WXUNIVERSAL__))
+
 #ifndef WX_PRECOMP
 #include <stdio.h>
 #include "wx/utils.h"
@@ -31,7 +33,7 @@
 #include "wx/dcclient.h"
 #include "wx/choice.h"
 #include "wx/checkbox.h"
-#include <wx/intl.h>
+#include "wx/intl.h"
 #endif
 
 #include <string.h>
 #include "wx/cmndata.h"
 #include "wx/generic/fontdlgg.h"
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxGenericFontDialog, wxDialog)
 
 BEGIN_EVENT_TABLE(wxGenericFontDialog, wxDialog)
-       EVT_CHECKBOX(wxID_FONT_UNDERLINE, wxGenericFontDialog::OnChangeFont)
-       EVT_CHOICE(wxID_FONT_STYLE, wxGenericFontDialog::OnChangeFont)
-       EVT_CHOICE(wxID_FONT_WEIGHT, 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)
+    EVT_CHECKBOX(wxID_FONT_UNDERLINE, wxGenericFontDialog::OnChangeFont)
+    EVT_CHOICE(wxID_FONT_STYLE, wxGenericFontDialog::OnChangeFont)
+    EVT_CHOICE(wxID_FONT_WEIGHT, 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()
 
-#endif
 
 #define NUM_COLS 48
-static wxString wxColourDialogNames[NUM_COLS]={_T("ORANGE"),
-                                   _T("GOLDENROD"),
-                                   _T("WHEAT"),
-                                   _T("SPRING GREEN"),
-                                   _T("SKY BLUE"),
-                                   _T("SLATE BLUE"),
-                                   _T("MEDIUM VIOLET RED"),
-                                   _T("PURPLE"),
-
-                                   _T("RED"),
-                                   _T("YELLOW"),
-                                   _T("MEDIUM SPRING GREEN"),
-                                   _T("PALE GREEN"),
-                                   _T("CYAN"),
-                                   _T("LIGHT STEEL BLUE"),
-                                   _T("ORCHID"),
-                                   _T("LIGHT MAGENTA"),
-                                   
-                                   _T("BROWN"),
-                                   _T("YELLOW"),
-                                   _T("GREEN"),
-                                   _T("CADET BLUE"),
-                                   _T("MEDIUM BLUE"),
-                                   _T("MAGENTA"),
-                                   _T("MAROON"),
-                                   _T("ORANGE RED"),
-
-                                   _T("FIREBRICK"),
-                                   _T("CORAL"),
-                                   _T("FOREST GREEN"),
-                                   _T("AQUARAMINE"),
-                                   _T("BLUE"),
-                                   _T("NAVY"),
-                                   _T("THISTLE"),
-                                   _T("MEDIUM VIOLET RED"),
-                                   
-                                   _T("INDIAN RED"),
-                                   _T("GOLD"),
-                                   _T("MEDIUM SEA GREEN"),
-                                   _T("MEDIUM BLUE"),
-                                   _T("MIDNIGHT BLUE"),
-                                   _T("GREY"),
-                                   _T("PURPLE"),
-                                   _T("KHAKI"),
-                                   
-                                   _T("BLACK"),
-                                   _T("MEDIUM FOREST GREEN"),
-                                   _T("KHAKI"),
-                                   _T("DARK GREY"),
-                                   _T("SEA GREEN"),
-                                   _T("LIGHT GREY"),
-                                   _T("MEDIUM SLATE BLUE"),
-                                   _T("WHITE")
-                                   };
+static wxString wxColourDialogNames[NUM_COLS]={wxT("ORANGE"),
+                    wxT("GOLDENROD"),
+                    wxT("WHEAT"),
+                    wxT("SPRING GREEN"),
+                    wxT("SKY BLUE"),
+                    wxT("SLATE BLUE"),
+                    wxT("MEDIUM VIOLET RED"),
+                    wxT("PURPLE"),
+
+                    wxT("RED"),
+                    wxT("YELLOW"),
+                    wxT("MEDIUM SPRING GREEN"),
+                    wxT("PALE GREEN"),
+                    wxT("CYAN"),
+                    wxT("LIGHT STEEL BLUE"),
+                    wxT("ORCHID"),
+                    wxT("LIGHT MAGENTA"),
+
+                    wxT("BROWN"),
+                    wxT("YELLOW"),
+                    wxT("GREEN"),
+                    wxT("CADET BLUE"),
+                    wxT("MEDIUM BLUE"),
+                    wxT("MAGENTA"),
+                    wxT("MAROON"),
+                    wxT("ORANGE RED"),
+
+                    wxT("FIREBRICK"),
+                    wxT("CORAL"),
+                    wxT("FOREST GREEN"),
+                    wxT("AQUARAMINE"),
+                    wxT("BLUE"),
+                    wxT("NAVY"),
+                    wxT("THISTLE"),
+                    wxT("MEDIUM VIOLET RED"),
+
+                    wxT("INDIAN RED"),
+                    wxT("GOLD"),
+                    wxT("MEDIUM SEA GREEN"),
+                    wxT("MEDIUM BLUE"),
+                    wxT("MIDNIGHT BLUE"),
+                    wxT("GREY"),
+                    wxT("PURPLE"),
+                    wxT("KHAKI"),
+
+                    wxT("BLACK"),
+                    wxT("MEDIUM FOREST GREEN"),
+                    wxT("KHAKI"),
+                    wxT("DARK GREY"),
+                    wxT("SEA GREEN"),
+                    wxT("LIGHT GREY"),
+                    wxT("MEDIUM SLATE BLUE"),
+                    wxT("WHITE")
+                    };
 
 /*
  * Generic wxFontDialog
@@ -137,17 +137,17 @@ void wxGenericFontDialog::OnCloseWindow(wxCloseEvent& WXUNUSED(event))
 {
   EndModal(wxID_CANCEL);
 }
+
 bool wxGenericFontDialog::Create(wxWindow *parent, wxFontData *data)
 {
   dialogParent = parent;
-  
+
   if (data)
     fontData = *data;
 
   InitializeFont();
   CreateWidgets();
-  
+
   return TRUE;
 }
 
@@ -160,14 +160,12 @@ int wxGenericFontDialog::ShowModal(void)
       fontData.chosenFont = dialogFont;
     }
 
-       return ret;
+    return ret;
 }
 
 
-void wxGenericFontDialog::OnPaint(wxPaintEvent& event)
+void wxGenericFontDialog::OnPaint(wxPaintEvent& WXUNUSED(event))
 {
-  wxDialog::OnPaint(event);
-
   wxPaintDC dc(this);
   PaintFontBackground(dc);
   PaintFont(dc);
@@ -202,7 +200,7 @@ void wxGenericFontDialog::CreateWidgets(void)
     static char *styles[] = { "Normal", "Italic", "Slant" };
     static char *weights[] = { "Normal", "Light", "Bold" };
   */
-  
+
   wxString
      *families = new wxString[6],
      *styles = new wxString[3],
@@ -219,7 +217,7 @@ void wxGenericFontDialog::CreateWidgets(void)
   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);
@@ -230,16 +228,16 @@ void wxGenericFontDialog::CreateWidgets(void)
 #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
+  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;
+    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);
@@ -251,7 +249,7 @@ void wxGenericFontDialog::CreateWidgets(void)
   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) 
+  // the fontRect there  (+5 for a nice gap)
 
   fontRect.y+=y+5; //NL mod
 
@@ -265,7 +263,7 @@ void wxGenericFontDialog::CreateWidgets(void)
   weightChoice->SetStringSelection(wxFontWeightIntToString(dialogFont.GetWeight()));
   wxString name(wxTheColourDatabase->FindName(fontData.fontColour));
   colourChoice->SetStringSelection(name);
-    
+
   underLineCheckBox->SetValue(dialogFont.GetUnderlined());
   pointSizeChoice->SetSelection(dialogFont.GetPointSize()-1);
 
@@ -328,7 +326,7 @@ void wxGenericFontDialog::PaintFont(wxDC& dc)
     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.SetFont(wxNullFont);
   }
   dc.EndDrawing();
 }
@@ -336,7 +334,7 @@ void wxGenericFontDialog::PaintFont(wxDC& dc)
 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;
@@ -347,7 +345,7 @@ void wxGenericFontDialog::OnChangeFont(wxCommandEvent& WXUNUSED(event))
   int fontUnderline = underLineCheckBox->GetValue();
 
   dialogFont = wxFont(fontSize, fontFamily, fontStyle, fontWeight, (fontUnderline != 0));
-  if (colourChoice->GetStringSelection() != _T(""))
+  if (colourChoice->GetStringSelection() != wxT(""))
   {
     wxColour *col = (wxColour*) NULL;
     col = wxTheColourDatabase->FindColour(colourChoice->GetStringSelection());
@@ -366,14 +364,13 @@ wxChar *wxFontWeightIntToString(int weight)
   switch (weight)
   {
     case wxLIGHT:
-      return _T("Light");
+      return wxT("Light");
     case wxBOLD:
-      return _T("Bold");
+      return wxT("Bold");
     case wxNORMAL:
     default:
-      return _T("Normal");
+      return wxT("Normal");
   }
-  return _T("Normal");
 }
 
 wxChar *wxFontStyleIntToString(int style)
@@ -381,14 +378,13 @@ wxChar *wxFontStyleIntToString(int style)
   switch (style)
   {
     case wxITALIC:
-      return _T("Italic");
+      return wxT("Italic");
     case wxSLANT:
-      return _T("Slant");
+      return wxT("Slant");
     case wxNORMAL:
     default:
-      return _T("Normal");
+      return wxT("Normal");
   }
-  return _T("Normal");
 }
 
 wxChar *wxFontFamilyIntToString(int family)
@@ -396,36 +392,35 @@ wxChar *wxFontFamilyIntToString(int family)
   switch (family)
   {
     case wxROMAN:
-      return _T("Roman");
+      return wxT("Roman");
     case wxDECORATIVE:
-      return _T("Decorative");
+      return wxT("Decorative");
     case wxMODERN:
-      return _T("Modern");
+      return wxT("Modern");
     case wxSCRIPT:
-      return _T("Script");
+      return wxT("Script");
     case wxTELETYPE:
-      return _T("Teletype");
+      return wxT("Teletype");
     case wxSWISS:
     default:
-      return _T("Swiss");
+      return wxT("Swiss");
   }
-  return _T("Swiss");
 }
 
 int wxFontFamilyStringToInt(wxChar *family)
 {
   if (!family)
     return wxSWISS;
-    
-  if (wxStrcmp(family, _T("Roman")) == 0)
+
+  if (wxStrcmp(family, wxT("Roman")) == 0)
     return wxROMAN;
-  else if (wxStrcmp(family, _T("Decorative")) == 0)
+  else if (wxStrcmp(family, wxT("Decorative")) == 0)
     return wxDECORATIVE;
-  else if (wxStrcmp(family, _T("Modern")) == 0)
+  else if (wxStrcmp(family, wxT("Modern")) == 0)
     return wxMODERN;
-  else if (wxStrcmp(family, _T("Script")) == 0)
+  else if (wxStrcmp(family, wxT("Script")) == 0)
     return wxSCRIPT;
-  else if (wxStrcmp(family, _T("Teletype")) == 0)
+  else if (wxStrcmp(family, wxT("Teletype")) == 0)
     return wxTELETYPE;
   else return wxSWISS;
 }
@@ -434,9 +429,9 @@ int wxFontStyleStringToInt(wxChar *style)
 {
   if (!style)
     return wxNORMAL;
-  if (wxStrcmp(style, _T("Italic")) == 0)
+  if (wxStrcmp(style, wxT("Italic")) == 0)
     return wxITALIC;
-  else if (wxStrcmp(style, _T("Slant")) == 0)
+  else if (wxStrcmp(style, wxT("Slant")) == 0)
     return wxSLANT;
   else
     return wxNORMAL;
@@ -446,12 +441,14 @@ int wxFontWeightStringToInt(wxChar *weight)
 {
   if (!weight)
     return wxNORMAL;
-  if (wxStrcmp(weight, _T("Bold")) == 0)
+  if (wxStrcmp(weight, wxT("Bold")) == 0)
     return wxBOLD;
-  else if (wxStrcmp(weight, _T("Light")) == 0)
+  else if (wxStrcmp(weight, wxT("Light")) == 0)
     return wxLIGHT;
   else
     return wxNORMAL;
 }
 
+#endif
+    // wxUSE_FONTDLG