Added install scripts in missing places
Fixed wxFrame resize behaviour for GTK 1.1.3 Added GetMousePosition Added const char** constructors to icon and bitmap Autolayout should now work for wxDialog git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1024 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -119,11 +119,10 @@ bool MyApp::OnInit(void)
|
||||
MyFrame *frame = new MyFrame((wxFrame *) NULL, (char *) "Controls wxWindows App", 50, 50, 530, 420 );
|
||||
|
||||
// Give it an icon
|
||||
#ifdef __WXMSW__
|
||||
frame->SetIcon(wxIcon("mondrian"));
|
||||
#else
|
||||
frame->SetIcon(wxIcon( mondrian_xpm ));
|
||||
#endif
|
||||
// The wxICON() macros loads an icon from a resource under Windows
|
||||
// and uses an #included XPM image under GTK+ and Motif
|
||||
|
||||
frame->SetIcon( wxICON(mondrian) );
|
||||
|
||||
wxMenu *file_menu = new wxMenu;
|
||||
|
||||
@@ -270,12 +269,12 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h ) :
|
||||
#else
|
||||
wxImageList *imagelist = new wxImageList(32, 32);
|
||||
|
||||
imagelist-> Add( wxBitmap( list_xpm ));
|
||||
imagelist-> Add( wxBitmap( choice_xpm ));
|
||||
imagelist-> Add( wxBitmap( combo_xpm ));
|
||||
imagelist-> Add( wxBitmap( text_xpm ));
|
||||
imagelist-> Add( wxBitmap( radio_xpm ));
|
||||
imagelist-> Add( wxBitmap( gauge_xpm ));
|
||||
imagelist-> Add( wxBitmap( (const char**) list_xpm ));
|
||||
imagelist-> Add( wxBitmap( (const char**) choice_xpm ));
|
||||
imagelist-> Add( wxBitmap( (const char**) combo_xpm ));
|
||||
imagelist-> Add( wxBitmap( (const char**) text_xpm ));
|
||||
imagelist-> Add( wxBitmap( (const char**) radio_xpm ));
|
||||
imagelist-> Add( wxBitmap( (const char**) gauge_xpm ));
|
||||
#endif
|
||||
|
||||
wxButton *button = (wxButton*)NULL;
|
||||
|
Reference in New Issue
Block a user