more updates for recent toolbar changes

[wxWidgets.git] / samples / richedit / wxLayout.cpp

diff --git a/samples/richedit/wxLayout.cpp b/samples/richedit/wxLayout.cpp
index d650aea0ae54663a202e20765922fc815a38ebf2..89fe57e094628b82dc029ea6bda16997a25d86c5 100644 (file)
--- a/samples/richedit/wxLayout.cpp
+++ b/samples/richedit/wxLayout.cpp
@@ -11,7 +11,7 @@
 #pragma implementation "wxLayout.h"
 #endif
 
 #pragma implementation "wxLayout.h"
 #endif
 

-#include <wx/wxprec.h>
+#include "wx/wxprec.h"

 #ifdef __BORLANDC__
 #  pragma hdrstop
 #endif
 #ifdef __BORLANDC__
 #  pragma hdrstop
 #endif


@@ -20,7 +20,11 @@
 #include <wx/textfile.h>
 #include <wx/image.h>
 
 #include <wx/textfile.h>
 #include <wx/image.h>
 

-#include <iostream.h>
+#if wxUSE_IOSTREAMH
+    #include <iostream.h>
+#else
+    #include <iostream>
+#endif

 
 #include   "Micon.xpm"
 
 
 #include   "Micon.xpm"
 


@@ -171,7 +175,11 @@ MyFrame::AddSampleText(wxLayoutList *llist)
    llist->Insert("The quick brown fox jumps over the lazy dog.");
    llist->LineBreak();
    llist->Insert("Hello ");
    llist->Insert("The quick brown fox jumps over the lazy dog.");
    llist->LineBreak();
    llist->Insert("Hello ");

+#if wxICON_IS_BITMAP

    llist->Insert(new wxLayoutObjectIcon(new wxICON(Micon)));
    llist->Insert(new wxLayoutObjectIcon(new wxICON(Micon)));

+#else
+   llist->Insert(new wxLayoutObjectIcon(new wxBitmap (wxICON(Micon))));
+#endif

    llist->SetFontWeight(wxBOLD);
    llist->Insert("World! ");
    llist->SetFontWeight(wxNORMAL);
    llist->SetFontWeight(wxBOLD);
    llist->Insert("World! ");
    llist->SetFontWeight(wxNORMAL);


@@ -465,7 +473,7 @@ void MyFrame::OnPageSetup(wxCommandEvent& WXUNUSED(event))
 #endif
    wxPageSetupData data;
 
 #endif
    wxPageSetupData data;
 

-#ifdef __WXMSW__
+#if defined(__WXMSW__) || defined(__WXMAC__)

    wxPageSetupDialog pageSetupDialog(this, & data);
 #else
    wxGenericPageSetupDialog pageSetupDialog(this, & data);
    wxPageSetupDialog pageSetupDialog(this, & data);
 #else
    wxGenericPageSetupDialog pageSetupDialog(this, & data);


@@ -481,7 +489,7 @@ void MyFrame::OnPrintSetupPS(wxCommandEvent& WXUNUSED(event))
 
    wxPrintData data;
 
 
    wxPrintData data;
 

-#ifdef __WXMSW__
+#if defined(__WXMSW__) || defined(__WXMAC__)

    wxPrintDialog printerDialog(this, & data);
 #else
    wxGenericPrintDialog printerDialog(this, & data);
    wxPrintDialog printerDialog(this, & data);
 #else
    wxGenericPrintDialog printerDialog(this, & data);


@@ -494,7 +502,7 @@ void MyFrame::OnPageSetupPS(wxCommandEvent& WXUNUSED(event))
    wxGetApp().SetPrintMode(wxPRINT_POSTSCRIPT);
 
    wxPageSetupData data;
    wxGetApp().SetPrintMode(wxPRINT_POSTSCRIPT);
 
    wxPageSetupData data;

-#ifdef __WXMSW__
+#if defined(__WXMSW__) || defined(__WXMAC__)

    wxPageSetupDialog pageSetupDialog(this, & data);
 #else
    wxGenericPageSetupDialog pageSetupDialog(this, & data);
    wxPageSetupDialog pageSetupDialog(this, & data);
 #else
    wxGenericPageSetupDialog pageSetupDialog(this, & data);