use stock colour/pen/brush objects in samples

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73095 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/samples/controls/controls.cpp b/samples/controls/controls.cpp
index 6c73d21a03a37f109d49367dfb796795b1d85614..ea60421a1e4e5fcb039e0b6bfd93f6b5f999c818 100644 (file)
--- a/samples/controls/controls.cpp
+++ b/samples/controls/controls.cpp
@@ -1250,8 +1250,8 @@ void MyPanel::OnChangeColour(wxCommandEvent& WXUNUSED(event))
     }
     else
     {
     }
     else
     {

-        s_colOld = wxColour(wxT("red"));
-        SetBackgroundColour(wxT("white"));
+        s_colOld = *wxRED;
+        SetBackgroundColour(*wxWHITE);

 
         m_lbSelectThis->SetForegroundColour(wxT("white"));
         m_lbSelectThis->SetBackgroundColour(wxT("red"));
 
         m_lbSelectThis->SetForegroundColour(wxT("white"));
         m_lbSelectThis->SetBackgroundColour(wxT("red"));

diff --git a/samples/drawing/drawing.cpp b/samples/drawing/drawing.cpp
index dd9709656f0dfa009ebc8ffd1f60d81f54d8307b..1404a120d96097d95db4fa6f8b0cd232fe7b46a7 100644 (file)
--- a/samples/drawing/drawing.cpp
+++ b/samples/drawing/drawing.cpp
@@ -1302,19 +1302,19 @@ void MyCanvas::DrawGradients(wxDC& dc)
     r3.y += 60;
     wxRect r4 = r2;
     r4.y += 60;
     r3.y += 60;
     wxRect r4 = r2;
     r4.y += 60;

-    dc.SetPen(wxPen(wxColour(255, 0, 0)));
+    dc.SetPen(*wxRED_PEN);

     dc.DrawRectangle(r);
     r.Deflate(1);
     dc.DrawRectangle(r);
     r.Deflate(1);

-    dc.GradientFillLinear(r, wxColour(0,255,0), wxColour(0,0,0), wxNORTH);
+    dc.GradientFillLinear(r, *wxGREEN, *wxBLACK, wxNORTH);

     dc.DrawRectangle(r2);
     r2.Deflate(1);
     dc.DrawRectangle(r2);
     r2.Deflate(1);

-    dc.GradientFillLinear(r2, wxColour(0,0,0), wxColour(0,255,0), wxSOUTH);
+    dc.GradientFillLinear(r2, *wxBLACK, *wxGREEN, wxSOUTH);

     dc.DrawRectangle(r3);
     r3.Deflate(1);
     dc.DrawRectangle(r3);
     r3.Deflate(1);

-    dc.GradientFillLinear(r3, wxColour(0,255,0), wxColour(0,0,0), wxEAST);
+    dc.GradientFillLinear(r3, *wxGREEN, *wxBLACK, wxEAST);

     dc.DrawRectangle(r4);
     r4.Deflate(1);
     dc.DrawRectangle(r4);
     r4.Deflate(1);

-    dc.GradientFillLinear(r4, wxColour(0,0,0), wxColour(0,255,0), wxWEST);
+    dc.GradientFillLinear(r4, *wxBLACK, *wxGREEN, wxWEST);

 
 #if wxUSE_GRAPHICS_CONTEXT
     if (m_useContext)
 
 #if wxUSE_GRAPHICS_CONTEXT
     if (m_useContext)


@@ -1328,9 +1328,9 @@ void MyCanvas::DrawGradients(wxDC& dc)
         dc.DrawText(wxT("Linear Gradient with Stops"), gfr.x, gfr.y);
         gfr.Offset(0, TEXT_HEIGHT);
 
         dc.DrawText(wxT("Linear Gradient with Stops"), gfr.x, gfr.y);
         gfr.Offset(0, TEXT_HEIGHT);
 

-        stops = wxGraphicsGradientStops(wxColour(255,0,0), wxColour(0,0,255));
+        stops = wxGraphicsGradientStops(*wxRED, *wxBLUE);

         stops.Add(wxColour(255,255,0), 0.33f);
         stops.Add(wxColour(255,255,0), 0.33f);

-        stops.Add(wxColour(0,255,0), 0.67f);
+        stops.Add(*wxGREEN, 0.67f);

 
         gc->SetBrush(gc->CreateLinearGradientBrush(gfr.x, gfr.y,
                                                    gfr.x + gfr.width, gfr.y + gfr.height,
 
         gc->SetBrush(gc->CreateLinearGradientBrush(gfr.x, gfr.y,
                                                    gfr.x + gfr.width, gfr.y + gfr.height,


@@ -1365,11 +1365,11 @@ void MyCanvas::DrawGradients(wxDC& dc)
         dc.DrawText(wxT("Linear Gradient with Stops and Gaps"), gfr.x, gfr.y);
         gfr.Offset(0, TEXT_HEIGHT);
 
         dc.DrawText(wxT("Linear Gradient with Stops and Gaps"), gfr.x, gfr.y);
         gfr.Offset(0, TEXT_HEIGHT);
 

-        stops = wxGraphicsGradientStops(wxColour(255,0,0), wxColour(0,0,255));
+        stops = wxGraphicsGradientStops(*wxRED, *wxBLUE);

         stops.Add(wxColour(255,255,0), 0.33f);
         stops.Add(wxTransparentColour, 0.33f);
         stops.Add(wxTransparentColour, 0.67f);
         stops.Add(wxColour(255,255,0), 0.33f);
         stops.Add(wxTransparentColour, 0.33f);
         stops.Add(wxTransparentColour, 0.67f);

-        stops.Add(wxColour(0,255,0), 0.67f);
+        stops.Add(*wxGREEN, 0.67f);

 
         gc->SetBrush(gc->CreateLinearGradientBrush(gfr.x, gfr.y + gfr.height,
                                                    gfr.x + gfr.width, gfr.y,
 
         gc->SetBrush(gc->CreateLinearGradientBrush(gfr.x, gfr.y + gfr.height,
                                                    gfr.x + gfr.width, gfr.y,


@@ -1404,12 +1404,12 @@ void MyCanvas::DrawGradients(wxDC& dc)
         dc.DrawText(wxT("Gradients with Stops and Transparency"), gfr.x, gfr.y);
         gfr.Offset(0, TEXT_HEIGHT);
 
         dc.DrawText(wxT("Gradients with Stops and Transparency"), gfr.x, gfr.y);
         gfr.Offset(0, TEXT_HEIGHT);
 

-        stops = wxGraphicsGradientStops(wxColour(255,0,0), wxTransparentColour);
-        stops.Add(wxColour(255,0,0), 0.33f);
+        stops = wxGraphicsGradientStops(*wxRED, wxTransparentColour);
+        stops.Add(*wxRED, 0.33f);

         stops.Add(wxTransparentColour, 0.33f);
         stops.Add(wxTransparentColour, 0.67f);
         stops.Add(wxTransparentColour, 0.33f);
         stops.Add(wxTransparentColour, 0.67f);

-        stops.Add(wxColour(0,0,255), 0.67f);
-        stops.Add(wxColour(0,0,255), 1.0f);
+        stops.Add(*wxBLUE, 0.67f);
+        stops.Add(*wxBLUE, 1.0f);

 
         pth = gc->CreatePath();
         pth.MoveToPoint(gfr.x,gfr.y);
 
         pth = gc->CreatePath();
         pth.MoveToPoint(gfr.x,gfr.y);

diff --git a/samples/mdi/mdi.cpp b/samples/mdi/mdi.cpp
index e68364cf01216c0a07ed7fa32ffb912aa0a3b1d8..c65e285682fa48d1ef3b750c45989a3a0a67f29b 100644 (file)
--- a/samples/mdi/mdi.cpp
+++ b/samples/mdi/mdi.cpp
@@ -340,7 +340,7 @@ MyCanvas::MyCanvas(wxWindow *parent, const wxPoint& pos, const wxSize& size)
                            wxNO_FULL_REPAINT_ON_RESIZE |
                            wxVSCROLL | wxHSCROLL)
 {
                            wxNO_FULL_REPAINT_ON_RESIZE |
                            wxVSCROLL | wxHSCROLL)
 {

-    SetBackgroundColour(wxColour("WHITE"));
+    SetBackgroundColour(*wxWHITE);

     SetCursor(wxCursor(wxCURSOR_PENCIL));
 
     SetScrollbars(20, 20, 50, 50);
     SetCursor(wxCursor(wxCURSOR_PENCIL));
 
     SetScrollbars(20, 20, 50, 50);

diff --git a/samples/mediaplayer/mediaplayer.cpp b/samples/mediaplayer/mediaplayer.cpp
index c75bb4e9704959fb3dbdac1ccc093da24cbe8f82..4055a71261c4726b455d59dfd3b6f1b5bfc2699f 100644 (file)
--- a/samples/mediaplayer/mediaplayer.cpp
+++ b/samples/mediaplayer/mediaplayer.cpp
@@ -1603,7 +1603,7 @@ wxMediaPlayerNotebookPage::wxMediaPlayerNotebookPage(wxMediaPlayerFrame* parentF
                     | wxSUNKEN_BORDER);
 
     //  Set the background of our listctrl to white
                     | wxSUNKEN_BORDER);
 
     //  Set the background of our listctrl to white

-    m_playlist->SetBackgroundColour(wxColour(255,255,255));
+    m_playlist->SetBackgroundColour(*wxWHITE);

 
     //  The layout of the headers of the listctrl are like
     //  |   | File               |  Length
 
     //  The layout of the headers of the listctrl are like
     //  |   | File               |  Length

diff --git a/samples/memcheck/memcheck.cpp b/samples/memcheck/memcheck.cpp
index 43e33bb8019afd88006dc3242212eb97aee57637..511d8691e697b77ce5af5d3247768cdb81a8a224 100644 (file)
--- a/samples/memcheck/memcheck.cpp
+++ b/samples/memcheck/memcheck.cpp
@@ -86,7 +86,7 @@ bool MyApp::OnInit(void)
 #endif
 
   // object allocation
 #endif
 
   // object allocation

-  wxBrush* brush = new wxBrush(*wxRED);
+  wxBrush* brush = new wxBrush(*wxRED_BRUSH);

   wxBitmap* bitmap = new wxBitmap(100, 100);
 
   // non-object allocation
   wxBitmap* bitmap = new wxBitmap(100, 100);
 
   // non-object allocation

diff --git a/samples/regtest/regtest.cpp b/samples/regtest/regtest.cpp
index a12d6f28b75773c769f16b3a71372abd4a166290..711d0241f17510f8da62179a18dd89ee050deb65 100644 (file)
--- a/samples/regtest/regtest.cpp
+++ b/samples/regtest/regtest.cpp
@@ -367,7 +367,7 @@ RegFrame::RegFrame(wxFrame *parent, const wxChar *title, int x, int y, int w, in
         : wxFrame(parent, wxID_ANY, title, wxPoint(x, y), wxSize(w, h))
 {
     // this reduces flicker effects
         : wxFrame(parent, wxID_ANY, title, wxPoint(x, y), wxSize(w, h))
 {
     // this reduces flicker effects

-    SetBackgroundColour(wxColour(255, 255, 255));
+    SetBackgroundColour(*wxWHITE);

 
     // set the icon
     // ------------
 
     // set the icon
     // ------------

diff --git a/samples/richtext/richtext.cpp b/samples/richtext/richtext.cpp
index f101c86e5b743fa18a2238d444c023dc32acd1ff..b14b9bf1d31bf6b64d5fb3c43b14372dd1a48c46 100644 (file)
--- a/samples/richtext/richtext.cpp
+++ b/samples/richtext/richtext.cpp
@@ -985,13 +985,13 @@ void MyFrame::WriteInitialText()
     r.WriteImage(wxBitmap(smiley_xpm));
     r.WriteText(wxT(" Well, you can change text "));
 
     r.WriteImage(wxBitmap(smiley_xpm));
     r.WriteText(wxT(" Well, you can change text "));
 

-    r.BeginTextColour(wxColour(255, 0, 0));
+    r.BeginTextColour(*wxRED);

     r.WriteText(wxT("colour, like this red bit."));
     r.EndTextColour();
 
     wxRichTextAttr backgroundColourAttr;
     backgroundColourAttr.SetBackgroundColour(*wxGREEN);
     r.WriteText(wxT("colour, like this red bit."));
     r.EndTextColour();
 
     wxRichTextAttr backgroundColourAttr;
     backgroundColourAttr.SetBackgroundColour(*wxGREEN);

-    backgroundColourAttr.SetTextColour(wxColour(0, 0, 255));
+    backgroundColourAttr.SetTextColour(*wxBLUE);

     r.BeginStyle(backgroundColourAttr);
     r.WriteText(wxT(" And this blue on green bit."));
     r.EndStyle();
     r.BeginStyle(backgroundColourAttr);
     r.WriteText(wxT(" And this blue on green bit."));
     r.EndStyle();

diff --git a/samples/sashtest/sashtest.cpp b/samples/sashtest/sashtest.cpp
index 5ed6c61b883bf56368afb2b9dfb07b45292c98c4..13b6a9df3dc3d79e97d92493ee27572e2f8c4853 100644 (file)
--- a/samples/sashtest/sashtest.cpp
+++ b/samples/sashtest/sashtest.cpp
@@ -108,7 +108,7 @@ MyFrame::MyFrame(wxWindow *parent, const wxWindowID id, const wxString& title, c
   win->SetDefaultSize(wxSize(1000, 30));
   win->SetOrientation(wxLAYOUT_HORIZONTAL);
   win->SetAlignment(wxLAYOUT_TOP);
   win->SetDefaultSize(wxSize(1000, 30));
   win->SetOrientation(wxLAYOUT_HORIZONTAL);
   win->SetAlignment(wxLAYOUT_TOP);

-  win->SetBackgroundColour(wxColour(255, 0, 0));
+  win->SetBackgroundColour(*wxRED);

   win->SetSashVisible(wxSASH_BOTTOM, true);
 
   m_topWindow = win;
   win->SetSashVisible(wxSASH_BOTTOM, true);
 
   m_topWindow = win;


@@ -120,7 +120,7 @@ MyFrame::MyFrame(wxWindow *parent, const wxWindowID id, const wxString& title, c
   win->SetDefaultSize(wxSize(1000, 30));
   win->SetOrientation(wxLAYOUT_HORIZONTAL);
   win->SetAlignment(wxLAYOUT_BOTTOM);
   win->SetDefaultSize(wxSize(1000, 30));
   win->SetOrientation(wxLAYOUT_HORIZONTAL);
   win->SetAlignment(wxLAYOUT_BOTTOM);

-  win->SetBackgroundColour(wxColour(0, 0, 255));
+  win->SetBackgroundColour(*wxBLUE);

   win->SetSashVisible(wxSASH_TOP, true);
 
   m_bottomWindow = win;
   win->SetSashVisible(wxSASH_TOP, true);
 
   m_bottomWindow = win;


@@ -132,7 +132,7 @@ MyFrame::MyFrame(wxWindow *parent, const wxWindowID id, const wxString& title, c
   win->SetDefaultSize(wxSize(120, 1000));
   win->SetOrientation(wxLAYOUT_VERTICAL);
   win->SetAlignment(wxLAYOUT_LEFT);
   win->SetDefaultSize(wxSize(120, 1000));
   win->SetOrientation(wxLAYOUT_VERTICAL);
   win->SetAlignment(wxLAYOUT_LEFT);

-  win->SetBackgroundColour(wxColour(0, 255, 0));
+  win->SetBackgroundColour(*wxGREEN);

   win->SetSashVisible(wxSASH_RIGHT, true);
   win->SetExtraBorderSize(10);
 
   win->SetSashVisible(wxSASH_RIGHT, true);
   win->SetExtraBorderSize(10);
 

diff --git a/samples/shaped/shaped.cpp b/samples/shaped/shaped.cpp
index e1e3afc17abff8bfe6f3d382a9ec742721545de9..614b7d076a6ad026bde9d0412d12872a3bb68fde 100644 (file)
--- a/samples/shaped/shaped.cpp
+++ b/samples/shaped/shaped.cpp
@@ -490,7 +490,7 @@ SeeThroughFrame::SeeThroughFrame()
                   wxSTAY_ON_TOP),
          m_currentState(STATE_SEETHROUGH)
 {
                   wxSTAY_ON_TOP),
          m_currentState(STATE_SEETHROUGH)
 {

-    SetBackgroundColour(wxColour(255, 255, 255, 255));
+    SetBackgroundColour(*wxWHITE);

     SetBackgroundStyle(wxBG_STYLE_TRANSPARENT);
 }
 
     SetBackgroundStyle(wxBG_STYLE_TRANSPARENT);
 }
 

diff --git a/samples/svg/svgtest.cpp b/samples/svg/svgtest.cpp
index bcd3339105e46434f9523c89913141a2c1bb0c2b..a70673a59471aac0e2522f6cc7a8b68b11c38aaa 100644 (file)
--- a/samples/svg/svgtest.cpp
+++ b/samples/svg/svgtest.cpp
@@ -320,7 +320,7 @@ END_EVENT_TABLE()
 MyCanvas::MyCanvas(MyChild *parent, const wxPoint& pos, const wxSize& size)
     : wxScrolledWindow(parent, wxID_ANY, pos, size, wxSUNKEN_BORDER|wxVSCROLL|wxHSCROLL)
 {
 MyCanvas::MyCanvas(MyChild *parent, const wxPoint& pos, const wxSize& size)
     : wxScrolledWindow(parent, wxID_ANY, pos, size, wxSUNKEN_BORDER|wxVSCROLL|wxHSCROLL)
 {

-    SetBackgroundColour(wxColour(wxT("WHITE")));
+    SetBackgroundColour(*wxWHITE);

 
     m_child = parent;
     m_index = m_child->GetFrame()->GetCountOfChildren() % 9;
 
     m_child = parent;
     m_index = m_child->GetFrame()->GetCountOfChildren() % 9;

diff --git a/samples/treectrl/treetest.cpp b/samples/treectrl/treetest.cpp
index 8e0064d1df25714601d0f770ca13c7ed360ed930..8085917c9ee8cbc48e6628b248da912cca129a93 100644 (file)
--- a/samples/treectrl/treetest.cpp
+++ b/samples/treectrl/treetest.cpp
@@ -215,7 +215,7 @@ MyFrame::MyFrame(const wxString& title, int x, int y, int w, int h)
     // This reduces flicker effects - even better would be to define
     // OnEraseBackground to do nothing. When the tree control's scrollbars are
     // show or hidden, the frame is sent a background erase event.
     // This reduces flicker effects - even better would be to define
     // OnEraseBackground to do nothing. When the tree control's scrollbars are
     // show or hidden, the frame is sent a background erase event.

-    SetBackgroundColour(wxColour(255, 255, 255));
+    SetBackgroundColour(*wxWHITE);

 
     // Give it an icon
     SetIcon(wxICON(sample));
 
     // Give it an icon
     SetIcon(wxICON(sample));

diff --git a/samples/widgets/button.cpp b/samples/widgets/button.cpp
index 07523bf54325a9c5b558376f5744055627285d99..4376e39ae29b4d5d2d67456a2337ff21bfc94a00 100644 (file)
--- a/samples/widgets/button.cpp
+++ b/samples/widgets/button.cpp
@@ -619,7 +619,7 @@ wxBitmap ButtonWidgetsPage::CreateBitmap(const wxString& label)
     wxBitmap bmp(180, 70); // shouldn't hardcode but it's simpler like this
     wxMemoryDC dc;
     dc.SelectObject(bmp);
     wxBitmap bmp(180, 70); // shouldn't hardcode but it's simpler like this
     wxMemoryDC dc;
     dc.SelectObject(bmp);

-    dc.SetBackground(wxBrush(*wxCYAN));
+    dc.SetBackground(*wxCYAN_BRUSH);

     dc.Clear();
     dc.SetTextForeground(*wxBLACK);
     dc.DrawLabel(wxStripMenuCodes(m_textLabel->GetValue()) + wxT("\n")
     dc.Clear();
     dc.SetTextForeground(*wxBLACK);
     dc.DrawLabel(wxStripMenuCodes(m_textLabel->GetValue()) + wxT("\n")

diff --git a/samples/widgets/odcombobox.cpp b/samples/widgets/odcombobox.cpp
index 419a13408a0f3a1dd7e369bbc7a37229a1d1684e..6473e51983d2352bb80400cce93f0f72c2e75565 100644 (file)
--- a/samples/widgets/odcombobox.cpp
+++ b/samples/widgets/odcombobox.cpp
@@ -541,7 +541,7 @@ void ODComboboxWidgetsPage::CreateCombo()
 
     if ( m_chkBitmapbutton->GetValue() )
     {
 
     if ( m_chkBitmapbutton->GetValue() )
     {

-        wxBitmap bmpNormal = CreateBitmap(wxColour(0,0,255));
+        wxBitmap bmpNormal = CreateBitmap(*wxBLUE);

         wxBitmap bmpPressed = CreateBitmap(wxColour(0,0,128));
         wxBitmap bmpHover = CreateBitmap(wxColour(128,128,255));
         m_combobox->SetButtonBitmaps(bmpNormal,m_chkStdbutton->GetValue(),bmpPressed,bmpHover);
         wxBitmap bmpPressed = CreateBitmap(wxColour(0,0,128));
         wxBitmap bmpHover = CreateBitmap(wxColour(128,128,255));
         m_combobox->SetButtonBitmaps(bmpNormal,m_chkStdbutton->GetValue(),bmpPressed,bmpHover);

diff --git a/samples/widgets/toggle.cpp b/samples/widgets/toggle.cpp
index 9c3dc354bcbd12cd67c04f53fe30ea48d50ad6f9..349181862dd06ead185b269ac26656292e42a3d9 100644 (file)
--- a/samples/widgets/toggle.cpp
+++ b/samples/widgets/toggle.cpp
@@ -526,7 +526,7 @@ wxBitmap ToggleWidgetsPage::CreateBitmap(const wxString& label)
     wxBitmap bmp(180, 70); // shouldn't hardcode but it's simpler like this
     wxMemoryDC dc;
     dc.SelectObject(bmp);
     wxBitmap bmp(180, 70); // shouldn't hardcode but it's simpler like this
     wxMemoryDC dc;
     dc.SelectObject(bmp);

-    dc.SetBackground(wxBrush(*wxCYAN));
+    dc.SetBackground(*wxCYAN_BRUSH);

     dc.Clear();
     dc.SetTextForeground(*wxBLACK);
     dc.DrawLabel(wxStripMenuCodes(m_textLabel->GetValue()) + wxT("\n")
     dc.Clear();
     dc.SetTextForeground(*wxBLACK);
     dc.DrawLabel(wxStripMenuCodes(m_textLabel->GetValue()) + wxT("\n")