Got printing, toolbar samples compiling under Windows again

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@571 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/samples/makefile.nt b/samples/makefile.nt
index 3c90efb87d841eb1abca1a3d4c2207f28c1c914f..53a9de13f901ac91de2e462591d9f1796ca470f3 100644 (file)
--- a/samples/makefile.nt
+++ b/samples/makefile.nt
@@ -56,20 +56,20 @@ all:
         nmake -f makefile.nt DEBUG_FLAGS=$(DEBUG_FLAGS) LINK_DEBUG_FLAGS=$(LINK_DEBUG_FLAGS)
         cd $(WXDIR)\samples\internat
         nmake -f makefile.nt DEBUG_FLAGS=$(DEBUG_FLAGS) LINK_DEBUG_FLAGS=$(LINK_DEBUG_FLAGS)
         nmake -f makefile.nt DEBUG_FLAGS=$(DEBUG_FLAGS) LINK_DEBUG_FLAGS=$(LINK_DEBUG_FLAGS)
         cd $(WXDIR)\samples\internat
         nmake -f makefile.nt DEBUG_FLAGS=$(DEBUG_FLAGS) LINK_DEBUG_FLAGS=$(LINK_DEBUG_FLAGS)

-        cd $(WXDIR)\samples\ownerdrw
-        nmake -f makefile.nt DEBUG_FLAGS=$(DEBUG_FLAGS) LINK_DEBUG_FLAGS=$(LINK_DEBUG_FLAGS)
-        cd $(WXDIR)\samples\checklst
-        nmake -f makefile.nt DEBUG_FLAGS=$(DEBUG_FLAGS) LINK_DEBUG_FLAGS=$(LINK_DEBUG_FLAGS)

         cd $(WXDIR)\samples\dnd
         nmake -f makefile.nt DEBUG_FLAGS=$(DEBUG_FLAGS) LINK_DEBUG_FLAGS=$(LINK_DEBUG_FLAGS)
         cd $(WXDIR)\samples\joytest
         nmake -f makefile.nt DEBUG_FLAGS=$(DEBUG_FLAGS) LINK_DEBUG_FLAGS=$(LINK_DEBUG_FLAGS)
         cd $(WXDIR)\samples\dnd
         nmake -f makefile.nt DEBUG_FLAGS=$(DEBUG_FLAGS) LINK_DEBUG_FLAGS=$(LINK_DEBUG_FLAGS)
         cd $(WXDIR)\samples\joytest
         nmake -f makefile.nt DEBUG_FLAGS=$(DEBUG_FLAGS) LINK_DEBUG_FLAGS=$(LINK_DEBUG_FLAGS)

-        cd $(WXDIR)\samples\regtest
-        nmake -f makefile.nt DEBUG_FLAGS=$(DEBUG_FLAGS) LINK_DEBUG_FLAGS=$(LINK_DEBUG_FLAGS)

         cd $(WXDIR)\samples\taskbar
         nmake -f makefile.nt DEBUG_FLAGS=$(DEBUG_FLAGS) LINK_DEBUG_FLAGS=$(LINK_DEBUG_FLAGS)
         cd $(WXDIR)\samples\memcheck
         nmake -f makefile.nt DEBUG_FLAGS=$(DEBUG_FLAGS) LINK_DEBUG_FLAGS=$(LINK_DEBUG_FLAGS)
         cd $(WXDIR)\samples\taskbar
         nmake -f makefile.nt DEBUG_FLAGS=$(DEBUG_FLAGS) LINK_DEBUG_FLAGS=$(LINK_DEBUG_FLAGS)
         cd $(WXDIR)\samples\memcheck
         nmake -f makefile.nt DEBUG_FLAGS=$(DEBUG_FLAGS) LINK_DEBUG_FLAGS=$(LINK_DEBUG_FLAGS)

+        cd $(WXDIR)\samples\regtest
+        nmake -f makefile.nt DEBUG_FLAGS=$(DEBUG_FLAGS) LINK_DEBUG_FLAGS=$(LINK_DEBUG_FLAGS)
+        cd $(WXDIR)\samples\ownerdrw
+        nmake -f makefile.nt DEBUG_FLAGS=$(DEBUG_FLAGS) LINK_DEBUG_FLAGS=$(LINK_DEBUG_FLAGS)
+        cd $(WXDIR)\samples\checklst
+        nmake -f makefile.nt DEBUG_FLAGS=$(DEBUG_FLAGS) LINK_DEBUG_FLAGS=$(LINK_DEBUG_FLAGS)

 #        cd $(WXDIR)\samples\hello
 #        nmake -f makefile.nt DEBUG_FLAGS=$(DEBUG_FLAGS) LINK_DEBUG_FLAGS=$(LINK_DEBUG_FLAGS)
 #        cd $(WXDIR)\samples\fractal
 #        cd $(WXDIR)\samples\hello
 #        nmake -f makefile.nt DEBUG_FLAGS=$(DEBUG_FLAGS) LINK_DEBUG_FLAGS=$(LINK_DEBUG_FLAGS)
 #        cd $(WXDIR)\samples\fractal

diff --git a/samples/printing/mondrian.ico b/samples/printing/mondrian.ico
new file mode 100644 (file)
index 0000000..2310c5d
Binary files /dev/null and b/samples/printing/mondrian.ico differ

diff --git a/samples/printing/printing.cpp b/samples/printing/printing.cpp
index 2017286a372afa0b1318de608f110ad4ecb512cd..3afd248f6285ce2e2a59e149664801582cd006c9 100644 (file)
--- a/samples/printing/printing.cpp
+++ b/samples/printing/printing.cpp
@@ -52,15 +52,10 @@ wxFont    *itemFont;
 
 float     zoom_factor = 1.0;
 
 
 float     zoom_factor = 1.0;
 

-#ifdef __X__
-#include "aiai.xbm"
-#endif
-

 #ifdef __WXGTK__
 #include "folder.xpm"
 #endif
 
 #ifdef __WXGTK__
 #include "folder.xpm"
 #endif
 

-

 // Writes a header on a page. Margin units are in millimetres.
 bool WritePageHeader(wxPrintout *printout, wxDC *dc, char *text, float mmToLogical);
 
 // Writes a header on a page. Margin units are in millimetres.
 bool WritePageHeader(wxPrintout *printout, wxDC *dc, char *text, float mmToLogical);
 


@@ -325,8 +320,15 @@ void MyFrame::Draw(wxDC& dc)
   dc.DrawLine(0, 0, 200, 200);
   dc.DrawLine(200, 0, 0, 200);
   
   dc.DrawLine(0, 0, 200, 200);
   dc.DrawLine(200, 0, 0, 200);
   

+#if defined(__WXGTK__)

   wxIcon my_icon( folder_xpm );
   wxIcon my_icon( folder_xpm );

-  dc.DrawIcon( my_icon, 100, 100, TRUE );
+#elif defined(__WXMSW__)
+  wxIcon my_icon( "mondrian" );
+#elif
+#error "Platform not supported."
+#endif
+
+  dc.DrawIcon( my_icon, 100, 100);

 }
 
 void MyFrame::OnSize(wxSizeEvent& event )
 }
 
 void MyFrame::OnSize(wxSizeEvent& event )

diff --git a/samples/printing/printing.rc b/samples/printing/printing.rc
index 233da6128401fdd7b2a2804391ffa38f9524492c..7655c62a4c3f71bc6ddb1499a59ec06d57cf29e2 100644 (file)
--- a/samples/printing/printing.rc
+++ b/samples/printing/printing.rc
@@ -1,3 +1,3 @@
-aiai_icn ICON "aiai.ico"
+mondrian ICON "mondrian.ico"

 #include "wx/msw/wx.rc"
 
 #include "wx/msw/wx.rc"
 

diff --git a/samples/toolbar/mondrian.ico b/samples/toolbar/mondrian.ico
new file mode 100644 (file)
index 0000000..2310c5d
Binary files /dev/null and b/samples/toolbar/mondrian.ico differ