Got Penguin sample running under Windows.

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

diff --git a/samples/image/image.cpp b/samples/image/image.cpp
index 4e5146080765cc598395abcd8947c0bd2c1e11dd..3546f1f1e67ddb855ab9915f583301be3295a495 100644 (file)
--- a/samples/image/image.cpp
+++ b/samples/image/image.cpp
@@ -7,7 +7,17 @@
  *
  */
 
  *
  */
 

+// For compilers that support precompilation, includes "wx/wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+#pragma hdrstop
+#endif
+
+#ifndef WX_PRECOMP

 #include "wx/wx.h"
 #include "wx/wx.h"

+#endif
+

 #include "wx/image.h"
 
 // derived classes
 #include "wx/image.h"
 
 // derived classes


@@ -77,7 +87,7 @@ END_EVENT_TABLE()
 MyCanvas::MyCanvas( wxWindow *parent, const wxWindowID id, const wxPoint &pos, const wxSize &size ) 
   : wxScrolledWindow( parent, id, pos, size, wxSUNKEN_BORDER ) 
 {
 MyCanvas::MyCanvas( wxWindow *parent, const wxWindowID id, const wxPoint &pos, const wxSize &size ) 
   : wxScrolledWindow( parent, id, pos, size, wxSUNKEN_BORDER ) 
 {

-  wxImage image;
+  SetBackgroundColour(* wxWHITE);

 
   wxBitmap bitmap( 100, 100 );
   
 
   wxBitmap bitmap( 100, 100 );
   


@@ -87,15 +97,21 @@ MyCanvas::MyCanvas( wxWindow *parent, const wxWindowID id, const wxPoint &pos, c
   dc.SetPen( *wxWHITE_PEN );
   dc.DrawRectangle( 0, 0, 100, 100 );
   dc.SelectObject( wxNullBitmap );
   dc.SetPen( *wxWHITE_PEN );
   dc.DrawRectangle( 0, 0, 100, 100 );
   dc.SelectObject( wxNullBitmap );

+
+  wxString dir("");
+
+#ifdef __WXGTK__
+  dir = wxString("../");
+#endif
+
+  wxImage image( bitmap );
+  image.SaveFile( dir + wxString("test.png"), wxBITMAP_TYPE_PNG );

   
   

-  image = bitmap.ConvertToImage();
-  image.SaveFile( "../test.png", wxBITMAP_TYPE_PNG );
-  
-  image.LoadFile( "../horse.png", wxBITMAP_TYPE_PNG );
-  my_horse = new wxBitmap( image );
+  image.LoadFile( dir + wxString("horse.png"), wxBITMAP_TYPE_PNG );
+  my_horse = new wxBitmap( image.ConvertToBitmap() );

   
   

-  image.LoadFile( "../test.png", wxBITMAP_TYPE_PNG );
-  my_square = new wxBitmap( image );
+  image.LoadFile( dir + wxString("test.png"), wxBITMAP_TYPE_PNG );
+  my_square = new wxBitmap( image.ConvertToBitmap() );

 }
 
 MyCanvas::~MyCanvas(void)
 }
 
 MyCanvas::~MyCanvas(void)


@@ -142,8 +158,7 @@ MyFrame::MyFrame(void) :
   
   wxMenuBar *menu_bar = new wxMenuBar();
   menu_bar->Append(file_menu, "File");
   
   wxMenuBar *menu_bar = new wxMenuBar();
   menu_bar->Append(file_menu, "File");

-  menu_bar->Show( TRUE );
-  
+

   SetMenuBar( menu_bar );
   
   CreateStatusBar(2);
   SetMenuBar( menu_bar );
   
   CreateStatusBar(2);


@@ -168,7 +183,8 @@ void MyFrame::OnSize( wxSizeEvent &WXUNUSED(event) )
 {
   int w,h;
   GetClientSize( &w, &h );
 {
   int w,h;
   GetClientSize( &w, &h );

-  m_canvas->SetSize( w, h );
+  if (m_canvas)
+    m_canvas->SetSize( w, h );

 }
 
 //-----------------------------------------------------------------------------
 }
 
 //-----------------------------------------------------------------------------


@@ -190,7 +206,3 @@ bool MyApp::OnInit(void)
   return TRUE;
 }
 
   return TRUE;
 }
 

-
-
-
-