repaired recently broken framelayout

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

diff --git a/src/generic/fontdlgg.cpp b/src/generic/fontdlgg.cpp
index 4163f8e1c1a31aad85c7e40c051565f8ef9d93b7..c48439da7fd685518a54d524dda9fd44b83ac2fe 100644 (file)
--- a/src/generic/fontdlgg.cpp
+++ b/src/generic/fontdlgg.cpp
@@ -57,59 +57,59 @@ END_EVENT_TABLE()
 #endif
 
 #define NUM_COLS 48
 #endif
 
 #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",
+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"),

                                    
                                    

-                                   "BROWN",
-                                   "YELLOW",
-                                   "GREEN",
-                                   "CADET BLUE",
-                                   "MEDIUM BLUE",
-                                   "MAGENTA",
-                                   "MAROON",
-                                   "ORANGE RED",
-
-                                   "FIREBRICK",
-                                   "CORAL",
-                                   "FOREST GREEN",
-                                   "AQUARAMINE",
-                                   "BLUE",
-                                   "NAVY",
-                                   "THISTLE",
-                                   "MEDIUM VIOLET RED",
+                                   _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"),

                                    
                                    

-                                   "INDIAN RED",
-                                   "GOLD",
-                                   "MEDIUM SEA GREEN",
-                                   "MEDIUM BLUE",
-                                   "MIDNIGHT BLUE",
-                                   "GREY",
-                                   "PURPLE",
-                                   "KHAKI",
+                                   _T("INDIAN RED"),
+                                   _T("GOLD"),
+                                   _T("MEDIUM SEA GREEN"),
+                                   _T("MEDIUM BLUE"),
+                                   _T("MIDNIGHT BLUE"),
+                                   _T("GREY"),
+                                   _T("PURPLE"),
+                                   _T("KHAKI"),

                                    
                                    

-                                   "BLACK",
-                                   "MEDIUM FOREST GREEN",
-                                   "KHAKI",
-                                   "DARK GREY",
-                                   "SEA GREEN",
-                                   "LIGHT GREY",
-                                   "MEDIUM SLATE BLUE",
-                                   "WHITE"
+                                   _T("BLACK"),
+                                   _T("MEDIUM FOREST GREEN"),
+                                   _T("KHAKI"),
+                                   _T("DARK GREY"),
+                                   _T("SEA GREEN"),
+                                   _T("LIGHT GREY"),
+                                   _T("MEDIUM SLATE BLUE"),
+                                   _T("WHITE")

                                    };
 
 /*
                                    };
 
 /*


@@ -133,7 +133,7 @@ wxGenericFontDialog::~wxGenericFontDialog(void)
 {
 }
 
 {
 }
 

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

 {
   EndModal(wxID_CANCEL);
 }
 {
   EndModal(wxID_CANCEL);
 }