wxDateTime progress: DST compuation, weekday computation, day-in-year and week

[wxWidgets.git] / samples / controls / controls.cpp

diff --git a/samples/controls/controls.cpp b/samples/controls/controls.cpp
index 9bfc350010d6786172e8655c048d4c736466400f..b15eda6ee506072e1d85f0cb6d3fe9da808db9cb 100644 (file)
--- a/samples/controls/controls.cpp
+++ b/samples/controls/controls.cpp
@@ -219,7 +219,9 @@ bool MyApp::OnInit()
     // Create the main frame window
     MyFrame *frame = new MyFrame((wxFrame *) NULL,
             "Controls wxWindows App",
-            x, y, 530, 420);
+            x, y, 540, 430);
+    
+    frame->SetSizeHints( 500, 425 );
 
     // Give it an icon
     // The wxICON() macros loads an icon from a resource under Windows
@@ -608,6 +610,11 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
 
     (void)new wxBitmapButton(panel, -1, bitmap, wxPoint(100, 20));
 
+    bitmap = wxBitmap("../../utils/wxPython/tests/bitmaps/test2.bmp",
+                      wxBITMAP_TYPE_BMP);
+    bitmap.SetMask(new wxMask(bitmap, *wxBLUE));
+    (void)new wxBitmapButton(panel, -1, bitmap, wxPoint(300, 120));
+
     wxBitmap bmp1(wxTheApp->GetStdIcon(wxICON_INFORMATION)),
              bmp2(wxTheApp->GetStdIcon(wxICON_WARNING)),
              bmp3(wxTheApp->GetStdIcon(wxICON_QUESTION));