X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4693b20c7500190c3cc8c02919c45436bf5efbc9..c74d8df09d0c0e182cb2063cc4cc546de3a00fae:/samples/image/image.cpp?ds=inline

diff --git a/samples/image/image.cpp b/samples/image/image.cpp
index 71540921bc..c03daca077 100644
--- a/samples/image/image.cpp
+++ b/samples/image/image.cpp
@@ -66,8 +66,35 @@ private:
     DECLARE_EVENT_TABLE()
 };
 
+
+const int nChoices = 8 ;
+static const wxString bppchoices[nChoices] =
+{
+    "1 bpp color",
+    "1 bpp B&W",
+    "4 bpp color",
+    "8 bpp color",
+    "8 bpp greyscale",
+    "8 bpp red",
+    "8 bpp own palette",
+    "24 bpp"
+};
+
+static const int bppvalues[nChoices] =
+{
+    wxBMP_1BPP,
+    wxBMP_1BPP_BW,
+    wxBMP_4BPP,
+    wxBMP_8BPP,
+    wxBMP_8BPP_GREY,
+    wxBMP_8BPP_RED,
+    wxBMP_8BPP_PALETTE,
+    wxBMP_24BPP
+};
+
 // MyFrame
 
+
 class MyFrame: public wxFrame
 {
 public:
@@ -106,33 +133,9 @@ public:
     {
         wxImage image(m_bitmap);
 
-        static const wxString bppchoices[8] =
-        {
-            "1 bpp color",
-            "1 bpp B&W",
-            "4 bpp color",
-            "8 bpp color",
-            "8 bpp greyscale",
-            "8 bpp red",
-            "8 bpp own palette",
-            "24 bpp"
-        };
-
-        static const int bppvalues[WXSIZEOF(bppchoices)] =
-        {
-            wxBMP_1BPP,
-            wxBMP_1BPP_BW,
-            wxBMP_4BPP,
-            wxBMP_8BPP,
-            wxBMP_8BPP_GREY,
-            wxBMP_8BPP_RED,
-            wxBMP_8BPP_PALETTE,
-            wxBMP_24BPP
-        };
-
         int bppselection = wxGetSingleChoiceIndex("Set BMP BPP",
                                                   "Set BMP BPP",
-                                                  WXSIZEOF(bppchoices),
+                                                  nChoices,
                                                   bppchoices,
                                                   this);
         if ( bppselection == -1 )
@@ -250,7 +253,7 @@ MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id,
 
     wxMemoryDC dc;
     dc.SelectObject( bitmap );
-    dc.SetBrush( wxBrush( "orange", wxSOLID ) );
+    dc.SetBrush( wxBrush( wxT("orange"), wxSOLID ) );
     dc.SetPen( *wxBLACK_PEN );
     dc.DrawRectangle( 0, 0, 100, 100 );
     dc.SetBrush( *wxWHITE_BRUSH );
@@ -385,7 +388,7 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )
     if (my_square && my_square->Ok()) dc.DrawBitmap( *my_square, 30, 30 );
 
     dc.DrawText( "Drawn directly", 150, 10 );
-    dc.SetBrush( wxBrush( "orange", wxSOLID ) );
+    dc.SetBrush( wxBrush( wxT("orange"), wxSOLID ) );
     dc.SetPen( *wxBLACK_PEN );
     dc.DrawRectangle( 150, 30, 100, 100 );
     dc.SetBrush( *wxWHITE_BRUSH );
@@ -436,14 +439,14 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )
     {
         dc.DrawText( "XBM bitmap", 30, 1975 );
         dc.DrawText( "(green on red)", 30, 1990 );
-        dc.SetTextForeground( "GREEN" );
-        dc.SetTextBackground( "RED" );
+        dc.SetTextForeground( wxT("GREEN") );
+        dc.SetTextBackground( wxT("RED") );
         dc.DrawBitmap( *my_smile_xbm, 30, 2010 );
 
-        dc.SetTextForeground( "BLACK" );
+        dc.SetTextForeground( wxT("BLACK") );
         dc.DrawText( "After wxImage conversion", 150, 1975 );
         dc.DrawText( "(red on white)", 150, 1990 );
-        dc.SetTextForeground( "RED" );
+        dc.SetTextForeground( wxT("RED") );
         wxImage i = my_smile_xbm->ConvertToImage();
         i.SetMaskColour( 255, 255, 255 );
         i.Replace( 0, 0, 0,
@@ -451,7 +454,7 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )
                wxRED_PEN->GetColour().Green(),
                wxRED_PEN->GetColour().Blue() );
         dc.DrawBitmap( i.ConvertToBitmap(), 150, 2010, TRUE );
-        dc.SetTextForeground( "BLACK" );
+        dc.SetTextForeground( wxT("BLACK") );
     }
 
 
@@ -473,14 +476,14 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )
     {
         dc.DrawText( "Mono bitmap", 30, 2095 );
         dc.DrawText( "(red on green)", 30, 2110 );
-        dc.SetTextForeground( "RED" );
-        dc.SetTextBackground( "GREEN" );
+        dc.SetTextForeground( wxT("RED") );
+        dc.SetTextBackground( wxT("GREEN") );
         dc.DrawBitmap( mono, 30, 2130 );
 
-        dc.SetTextForeground( "BLACK" );
+        dc.SetTextForeground( wxT("BLACK") );
         dc.DrawText( "After wxImage conversion", 150, 2095 );
         dc.DrawText( "(red on white)", 150, 2110 );
-        dc.SetTextForeground( "RED" );
+        dc.SetTextForeground( wxT("RED") );
         wxImage i = mono.ConvertToImage();
         i.SetMaskColour( 255,255,255 );
         i.Replace( 0,0,0,
@@ -488,7 +491,7 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )
                wxRED_PEN->GetColour().Green(),
                wxRED_PEN->GetColour().Blue() );
         dc.DrawBitmap( i.ConvertToBitmap(), 150, 2130, TRUE );
-        dc.SetTextForeground( "BLACK" );
+        dc.SetTextForeground( wxT("BLACK") );
     }
 
     dc.DrawText("XPM bitmap", 30, 2230);
@@ -515,7 +518,7 @@ void MyCanvas::CreateAntiAliasedBitmap()
   dc.Clear();
 
   dc.SetFont( wxFont( 24, wxDECORATIVE, wxNORMAL, wxNORMAL) );
-  dc.SetTextForeground( "RED" );
+  dc.SetTextForeground( wxT("RED") );
   dc.DrawText( "This is anti-aliased Text.", 20, 20 );
   dc.DrawText( "And a Rectangle.", 20, 60 );