Canvas: added some DECLARE_CLASS macros to stop it failing

in class info initialisation
Mmedia: compiles agin
Plot: corrected VC++ project settings
Simple toolbar: should draw a highlight again now
Generic dir control: moved control ids to header for apps that
need to get hold of the individual controls
Scintilla: unconditionally compile Scintilla_LinkLexers() to correct
link error in sample


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15016 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2002-04-08 10:50:14 +00:00
parent 07d2031dde
commit a977709b11
12 changed files with 35 additions and 20 deletions

View File

@@ -71,7 +71,7 @@ MyFrame::MyFrame( wxWindow *parent, wxWindowID id, const wxString &title,
// Bunch of rects and images.
wxBitmap bitmap( smile_xpm );
wxImage image( bitmap );
wxImage image( bitmap.ConvertToImage() );
m_smile1 = new wxCanvasImage( image, 0,70,32,32 );
root->Append( m_smile1 );