Changed declaration of TREE events from being in both treectlg and treectrl to having...

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

diff --git a/src/generic/fontdlgg.cpp b/src/generic/fontdlgg.cpp
index 191f62517d022064ca4783437f5d2307ab23aa56..a7c96f96672a7095513628e31b7afae0b823bc43 100644 (file)
--- a/src/generic/fontdlgg.cpp
+++ b/src/generic/fontdlgg.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem

-// Licence:    wxWindows license
+// Licence:     wxWindows license

 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__


@@ -31,7 +31,7 @@
 #include "wx/dcclient.h"
 #include "wx/choice.h"
 #include "wx/checkbox.h"
 #include "wx/dcclient.h"
 #include "wx/choice.h"
 #include "wx/checkbox.h"

-#include <wx/intl.h>
+#include "wx/intl.h"

 #endif
 
 #include <string.h>
 #endif
 
 #include <string.h>


@@ -40,76 +40,75 @@
 #include "wx/cmndata.h"
 #include "wx/generic/fontdlgg.h"
 
 #include "wx/cmndata.h"
 #include "wx/generic/fontdlgg.h"
 

-#if !USE_SHARED_LIBRARY

 IMPLEMENT_DYNAMIC_CLASS(wxGenericFontDialog, wxDialog)
 
 BEGIN_EVENT_TABLE(wxGenericFontDialog, wxDialog)
 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_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()
 
 END_EVENT_TABLE()
 

-#endif

 
 #define NUM_COLS 48
 
 #define NUM_COLS 48

-static wxString wxColourDialogNames[NUM_COLS]={"ORANGE",
-                                   "GOLDENROD",
-                                   "WHEAT",
-                                   "SPRING GREEN",
-                                   "SKY BLUE",
-                                   "SLATE BLUE",
-                                   "MEDIUM VIOLET RED",
-                                   "PURPLE",
-
-                                   "RED",
-                                   "YELLOW",
-                                   "MEDIUM SPRING GREEN",
-                                   "PALE GREEN",
-                                   "CYAN",
-                                   "LIGHT STEEL BLUE",
-                                   "ORCHID",
-                                   "LIGHT MAGENTA",
-                                   
-                                   "BROWN",
-                                   "YELLOW",
-                                   "GREEN",
-                                   "CADET BLUE",
-                                   "MEDIUM BLUE",
-                                   "MAGENTA",
-                                   "MAROON",
-                                   "ORANGE RED",
-
-                                   "FIREBRICK",
-                                   "CORAL",
-                                   "FOREST GREEN",
-                                   "AQUARAMINE",
-                                   "BLUE",
-                                   "NAVY",
-                                   "THISTLE",
-                                   "MEDIUM VIOLET RED",
-                                   
-                                   "INDIAN RED",
-                                   "GOLD",
-                                   "MEDIUM SEA GREEN",
-                                   "MEDIUM BLUE",
-                                   "MIDNIGHT BLUE",
-                                   "GREY",
-                                   "PURPLE",
-                                   "KHAKI",
-                                   
-                                   "BLACK",
-                                   "MEDIUM FOREST GREEN",
-                                   "KHAKI",
-                                   "DARK GREY",
-                                   "SEA GREEN",
-                                   "LIGHT GREY",
-                                   "MEDIUM SLATE BLUE",
-                                   "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
 
 /*
  * Generic wxFontDialog


@@ -132,22 +131,21 @@ wxGenericFontDialog::~wxGenericFontDialog(void)
 {
 }
 
 {
 }
 

-bool wxGenericFontDialog::OnClose(void)
+void wxGenericFontDialog::OnCloseWindow(wxCloseEvent& WXUNUSED(event))

 {
 {

-  Show(FALSE);
-  return FALSE;
+  EndModal(wxID_CANCEL);

 }
 }

- 
+

 bool wxGenericFontDialog::Create(wxWindow *parent, wxFontData *data)
 {
   dialogParent = parent;
 bool wxGenericFontDialog::Create(wxWindow *parent, wxFontData *data)
 {
   dialogParent = parent;

-  
+

   if (data)
     fontData = *data;
 
   InitializeFont();
   CreateWidgets();
   if (data)
     fontData = *data;
 
   InitializeFont();
   CreateWidgets();

-  
+

   return TRUE;
 }
 
   return TRUE;
 }
 


@@ -160,14 +158,12 @@ int wxGenericFontDialog::ShowModal(void)
       fontData.chosenFont = dialogFont;
     }
 
       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);
   wxPaintDC dc(this);
   PaintFontBackground(dc);
   PaintFont(dc);


@@ -202,9 +198,9 @@ void wxGenericFontDialog::CreateWidgets(void)
     static char *styles[] = { "Normal", "Italic", "Slant" };
     static char *weights[] = { "Normal", "Light", "Bold" };
   */
     static char *styles[] = { "Normal", "Italic", "Slant" };
     static char *weights[] = { "Normal", "Light", "Bold" };
   */

-  
+

   wxString
   wxString

-     *families = new wxString[5],
+     *families = new wxString[6],

      *styles = new wxString[3],
      *weights = new wxString[3];
   families[0] =  _("Roman");
      *styles = new wxString[3],
      *weights = new wxString[3];
   families[0] =  _("Roman");


@@ -212,33 +208,34 @@ void wxGenericFontDialog::CreateWidgets(void)
   families[2] = _("Modern");
   families[3] = _("Script");
   families[4] = _("Swiss" );
   families[2] = _("Modern");
   families[3] = _("Script");
   families[4] = _("Swiss" );

+  families[5] = _("Teletype" );

   styles[0] = _("Normal");
   styles[1] = _("Italic");
   styles[2] = _("Slant");
   weights[0] = _("Normal");
   weights[1] = _("Light");
   weights[2] = _("Bold");
   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);
   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(160, 10), wxSize(120, -1), 3, styles);
-  weightChoice = new wxChoice(this, wxID_FONT_WEIGHT, wxPoint(310, 10), wxSize(120, -1), 3, weights);
+  styleChoice = new wxChoice(this, wxID_FONT_STYLE, wxPoint(170, 10), wxSize(120, -1), 3, styles);
+  weightChoice = new wxChoice(this, wxID_FONT_WEIGHT, wxPoint(330, 10), wxSize(120, -1), 3, weights);

 
 

-  colourChoice = new wxChoice(this, wxID_FONT_COLOUR, wxPoint(10, 40), wxSize(190, -1), NUM_COLS, wxColourDialogNames);
+  colourChoice = new wxChoice(this, wxID_FONT_COLOUR, wxPoint(10, 40), wxSize(180, -1), NUM_COLS, wxColourDialogNames);

 #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
 #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++)
   {
 #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);
   }
 
   pointSizeChoice = new wxChoice(this, wxID_FONT_SIZE, wxPoint(230, y), wxSize(50, -1), 40, pointSizes);


@@ -250,27 +247,28 @@ void wxGenericFontDialog::CreateWidgets(void)
   pointSizeChoice->GetSize(&x, &y); //NL mod
 
   // Calculate the position of the bottom of the pointSizeChoice, and place
   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
 
 
   fontRect.y+=y+5; //NL mod
 

-  int by = (fontRect.y + fontRect.height + 10);
+  int by = (fontRect.y + fontRect.height + 15);

 
 

-  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));
+  wxButton *okButton = new wxButton(this, wxID_OK, _("OK"), wxPoint(230, by), wxSize(75,-1));
+  (void) new wxButton(this, wxID_OK, _("Cancel"), wxPoint(330, by), wxSize(75,-1));

 
   familyChoice->SetStringSelection( wxFontFamilyIntToString(dialogFont.GetFamily()) );
   styleChoice->SetStringSelection(wxFontStyleIntToString(dialogFont.GetStyle()));
   weightChoice->SetStringSelection(wxFontWeightIntToString(dialogFont.GetWeight()));
   wxString name(wxTheColourDatabase->FindName(fontData.fontColour));
   colourChoice->SetStringSelection(name);
 
   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()-1);
 
   okButton->SetDefault();
 
   underLineCheckBox->SetValue(dialogFont.GetUnderlined());
   pointSizeChoice->SetSelection(dialogFont.GetPointSize()-1);
 
   okButton->SetDefault();
 

-  SetClientSize(450, by + 40);
+  //  SetClientSize(450, by + 40);
+  Fit();

 
   Centre(wxBOTH);
 
 
   Centre(wxBOTH);
 


@@ -326,7 +324,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.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();
 }
   }
   dc.EndDrawing();
 }


@@ -334,17 +332,21 @@ void wxGenericFontDialog::PaintFont(wxDC& dc)
 void wxGenericFontDialog::OnChangeFont(wxCommandEvent& WXUNUSED(event))
 {
   if (!m_useEvents) return;
 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 fontSize = atoi(pointSizeChoice->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 = wxAtoi(pointSizeChoice->GetStringSelection());

   int fontUnderline = underLineCheckBox->GetValue();
 
   dialogFont = wxFont(fontSize, fontFamily, fontStyle, fontWeight, (fontUnderline != 0));
   int fontUnderline = underLineCheckBox->GetValue();
 
   dialogFont = wxFont(fontSize, fontFamily, fontStyle, fontWeight, (fontUnderline != 0));

-  if (colourChoice->GetStringSelection() != "")
+  if (colourChoice->GetStringSelection() != wxT(""))

   {
   {

-    wxColour *col = wxTheColourDatabase->FindColour(colourChoice->GetStringSelection());
+    wxColour *col = (wxColour*) NULL;
+    col = wxTheColourDatabase->FindColour(colourChoice->GetStringSelection());

     if (col)
     {
       fontData.fontColour = *col;
     if (col)
     {
       fontData.fontColour = *col;


@@ -355,90 +357,91 @@ void wxGenericFontDialog::OnChangeFont(wxCommandEvent& WXUNUSED(event))
   PaintFont(dc);
 }
 
   PaintFont(dc);
 }
 

-char *wxFontWeightIntToString(int weight)
+wxChar *wxFontWeightIntToString(int weight)

 {
   switch (weight)
   {
     case wxLIGHT:
 {
   switch (weight)
   {
     case wxLIGHT:

-      return "Light";
+      return wxT("Light");

     case wxBOLD:
     case wxBOLD:

-      return "Bold";
+      return wxT("Bold");

     case wxNORMAL:
     default:
     case wxNORMAL:
     default:

-      return "Normal";
+      return wxT("Normal");

   }
   }

-  return "Normal";

 }
 
 }
 

-char *wxFontStyleIntToString(int style)
+wxChar *wxFontStyleIntToString(int style)

 {
   switch (style)
   {
     case wxITALIC:
 {
   switch (style)
   {
     case wxITALIC:

-      return "Italic";
+      return wxT("Italic");

     case wxSLANT:
     case wxSLANT:

-      return "Slant";
+      return wxT("Slant");

     case wxNORMAL:
     default:
     case wxNORMAL:
     default:

-      return "Normal";
+      return wxT("Normal");

   }
   }

-  return "Normal";

 }
 
 }
 

-char *wxFontFamilyIntToString(int family)
+wxChar *wxFontFamilyIntToString(int family)

 {
   switch (family)
   {
     case wxROMAN:
 {
   switch (family)
   {
     case wxROMAN:

-      return "Roman";
+      return wxT("Roman");

     case wxDECORATIVE:
     case wxDECORATIVE:

-      return "Decorative";
+      return wxT("Decorative");

     case wxMODERN:
     case wxMODERN:

-      return "Modern";
+      return wxT("Modern");

     case wxSCRIPT:
     case wxSCRIPT:

-      return "Script";
+      return wxT("Script");
+    case wxTELETYPE:
+      return wxT("Teletype");

     case wxSWISS:
     default:
     case wxSWISS:
     default:

-      return "Swiss";
+      return wxT("Swiss");

   }
   }

-  return "Swiss";

 }
 
 }
 

-int wxFontFamilyStringToInt(char *family)
+int wxFontFamilyStringToInt(wxChar *family)

 {
   if (!family)
     return wxSWISS;
 {
   if (!family)
     return wxSWISS;

-    
-  if (strcmp(family, "Roman") == 0)
+
+  if (wxStrcmp(family, wxT("Roman")) == 0)

     return wxROMAN;
     return wxROMAN;

-  else if (strcmp(family, "Decorative") == 0)
+  else if (wxStrcmp(family, wxT("Decorative")) == 0)

     return wxDECORATIVE;
     return wxDECORATIVE;

-  else if (strcmp(family, "Modern") == 0)
+  else if (wxStrcmp(family, wxT("Modern")) == 0)

     return wxMODERN;
     return wxMODERN;

-  else if (strcmp(family, "Script") == 0)
+  else if (wxStrcmp(family, wxT("Script")) == 0)

     return wxSCRIPT;
     return wxSCRIPT;

+  else if (wxStrcmp(family, wxT("Teletype")) == 0)
+    return wxTELETYPE;

   else return wxSWISS;
 }
 
   else return wxSWISS;
 }
 

-int wxFontStyleStringToInt(char *style)
+int wxFontStyleStringToInt(wxChar *style)

 {
   if (!style)
     return wxNORMAL;
 {
   if (!style)
     return wxNORMAL;

-  if (strcmp(style, "Italic") == 0)
+  if (wxStrcmp(style, wxT("Italic")) == 0)

     return wxITALIC;
     return wxITALIC;

-  else if (strcmp(style, "Slant") == 0)
+  else if (wxStrcmp(style, wxT("Slant")) == 0)

     return wxSLANT;
   else
     return wxNORMAL;
 }
 
     return wxSLANT;
   else
     return wxNORMAL;
 }
 

-int wxFontWeightStringToInt(char *weight)
+int wxFontWeightStringToInt(wxChar *weight)

 {
   if (!weight)
     return wxNORMAL;
 {
   if (!weight)
     return wxNORMAL;

-  if (strcmp(weight, "Bold") == 0)
+  if (wxStrcmp(weight, wxT("Bold")) == 0)

     return wxBOLD;
     return wxBOLD;

-  else if (strcmp(weight, "Light") == 0)
+  else if (wxStrcmp(weight, wxT("Light")) == 0)

     return wxLIGHT;
   else
     return wxNORMAL;
     return wxLIGHT;
   else
     return wxNORMAL;