Added BMP files for wxPlotWindow,

Replaced wxWindow with wxNotebookPage in wxNotebook. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5961 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-02-11 12:28:21 +00:00
parent 37a1f3f69b
commit 80a58c9968
12 changed files with 90 additions and 69 deletions
--- a/samples/controls/controls.cpp
+++ b/samples/controls/controls.cpp
@@ -632,7 +632,7 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )

    (void)new wxBitmapButton(panel, -1, bitmap, wxPoint(100, 20));

-#if 1
+#ifdef __WXMSW__
    // test for masked bitmap display
    bitmap = wxBitmap("test2.bmp", wxBITMAP_TYPE_BMP);
    bitmap.SetMask(new wxMask(bitmap, *wxBLUE));