Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Various compiler changes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6740 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2000-03-15 18:52:23 +00:00
parent 2d8e9af9c9
commit 669f7a111f
27 changed files with 131 additions and 184 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
samples/controls/controls.cpp
View File

@@ -616,7 +616,7 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
panel = new wxPanel(m_notebook);
#ifndef __WXMOTIF__ // wxStaticBitmap not working under Motif yet. MB
#if !defined(__WXMOTIF__) && !defined(__WIN16__) // wxStaticBitmap not working under Motif yet; and icons not allowed under WIN16.
wxIcon icon = wxTheApp->GetStdIcon(wxICON_INFORMATION);
wxStaticBitmap *bmpStatic = new wxStaticBitmap(panel, -1, icon,
wxPoint(10, 10));
@@ -642,6 +642,7 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
if (bitmap.Ok())
{
bitmap.SetMask(new wxMask(bitmap, *wxBLUE));
(void)new wxStaticBitmap /* wxBitmapButton */ (panel, -1, bitmap, wxPoint(300, 120));
}
#endif