Use a different manifest for each of x86, amd64 and ia64

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

diff --git a/samples/richedit/wxLayout.cpp b/samples/richedit/wxLayout.cpp
index 034eefb85b97e2bf4ce4925ca066a69e2291895d..cdb801617728744548a350bd4be236baabc1fe5f 100644 (file)
--- a/samples/richedit/wxLayout.cpp
+++ b/samples/richedit/wxLayout.cpp
@@ -7,10 +7,6 @@
  *
  */
 
-#ifdef __GNUG__
-#pragma implementation "wxLayout.h"
-#endif
-
 #include "wx/wxprec.h"
 #ifdef __BORLANDC__
 #  pragma hdrstop
@@ -78,7 +74,7 @@ MyFrame::MyFrame() :
 {
 #if wxUSE_STATUSBAR
    CreateStatusBar( 2 );
-   SetStatusText( _T("wxLayout by Karsten Ballüder.") );
+   SetStatusText( _T("wxLayout by Karsten Ballueder.") );
 #endif // wxUSE_STATUSBAR
 
    wxMenuBar *menu_bar = new wxMenuBar();
@@ -183,14 +179,7 @@ void MyFrame::AddSampleText(wxLayoutList *llist)
    llist->LineBreak();
 
     llist->Insert(_T("Hello "));
-    wxBitmap *icon =
-#if wxICON_IS_BITMAP
-        new wxIcon(Micon_xpm)
-#else
-        new wxBitmap (wxIcon(Micon_xpm))
-#endif
-
-        ;
+    wxBitmap *icon = new wxBitmap (wxIcon(Micon_xpm));
 
     llist->Insert(new wxLayoutObjectIcon(icon));
     llist->SetFontWeight(wxBOLD);
@@ -526,7 +515,7 @@ void MyFrame::OnPageSetup(wxCommandEvent& WXUNUSED(event))
 #else
    wxGetApp().SetPrintMode(wxPRINT_POSTSCRIPT);
 #endif
-   wxPageSetupData data;
+   wxPageSetupDialogData data;
 
 #if defined(__WXMSW__) || defined(__WXMAC__)
    wxPageSetupDialog pageSetupDialog(this, & data);
@@ -535,7 +524,7 @@ void MyFrame::OnPageSetup(wxCommandEvent& WXUNUSED(event))
 #endif
    pageSetupDialog.ShowModal();
 
-   data = pageSetupDialog.GetPageSetupData();
+   data = pageSetupDialog.GetPageSetupDialogData();
 }
 
 void MyFrame::OnPrintSetupPS(wxCommandEvent& WXUNUSED(event))