Fixes to allow compilation with no wchar_t (djgpp probably has a real wchar_t

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

diff --git a/samples/richedit/wxLayout.cpp b/samples/richedit/wxLayout.cpp
index a7098859651e3444223e2f846b2a0924d0545eec..f20d0fb0f270412f5419244c64289319ab2319d0 100644 (file)
--- a/samples/richedit/wxLayout.cpp
+++ b/samples/richedit/wxLayout.cpp
@@ -66,8 +66,8 @@ BEGIN_EVENT_TABLE(MyFrame,wxFrame)
    EVT_MENU(ID_PREVIEW_PS, MyFrame::OnPrintPreviewPS)
    EVT_MENU(ID_PRINT_SETUP_PS, MyFrame::OnPrintSetupPS)
    EVT_MENU(ID_PAGE_SETUP_PS, MyFrame::OnPageSetupPS)
    EVT_MENU(ID_PREVIEW_PS, MyFrame::OnPrintPreviewPS)
    EVT_MENU(ID_PRINT_SETUP_PS, MyFrame::OnPrintSetupPS)
    EVT_MENU(ID_PAGE_SETUP_PS, MyFrame::OnPageSetupPS)

-   EVT_MENU    (-1,       MyFrame::OnCommand)
-   EVT_COMMAND (-1,-1,    MyFrame::OnCommand)
+   EVT_MENU    (wxID_ANY,       MyFrame::OnCommand)
+   EVT_COMMAND (wxID_ANY,wxID_ANY,    MyFrame::OnCommand)

    EVT_CHAR    (  wxLayoutWindow::OnChar  )
 END_EVENT_TABLE()
 
    EVT_CHAR    (  wxLayoutWindow::OnChar  )
 END_EVENT_TABLE()
 


@@ -76,9 +76,10 @@ MyFrame::MyFrame() :
    wxFrame( (wxFrame *) NULL, wxID_ANY, _T("wxLayout"),
              wxDefaultPosition, wxDefaultSize )
 {
    wxFrame( (wxFrame *) NULL, wxID_ANY, _T("wxLayout"),
              wxDefaultPosition, wxDefaultSize )
 {

+#if wxUSE_STATUSBAR

    CreateStatusBar( 2 );
    CreateStatusBar( 2 );

-
-   SetStatusText( _T("wxLayout by Karsten Ballüder.") );
+   SetStatusText( _T("wxLayout by Karsten Ballueder.") );
+#endif // wxUSE_STATUSBAR

 
    wxMenuBar *menu_bar = new wxMenuBar();
 
 
    wxMenuBar *menu_bar = new wxMenuBar();
 


@@ -128,7 +129,9 @@ MyFrame::MyFrame() :
    SetMenuBar( menu_bar );
 
    m_lwin = new wxLayoutWindow(this);
    SetMenuBar( menu_bar );
 
    m_lwin = new wxLayoutWindow(this);

+#if wxUSE_STATUSBAR

    m_lwin->SetStatusBar(GetStatusBar(), 0, 1);
    m_lwin->SetStatusBar(GetStatusBar(), 0, 1);

+#endif // wxUSE_STATUSBAR

    m_lwin->SetMouseTracking(true);
    m_lwin->SetEditable(true);
    m_lwin->SetWrapMargin(40);
    m_lwin->SetMouseTracking(true);
    m_lwin->SetEditable(true);
    m_lwin->SetWrapMargin(40);


@@ -180,14 +183,7 @@ void MyFrame::AddSampleText(wxLayoutList *llist)
    llist->LineBreak();
 
     llist->Insert(_T("Hello "));
    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);
 
     llist->Insert(new wxLayoutObjectIcon(icon));
     llist->SetFontWeight(wxBOLD);


@@ -523,7 +519,7 @@ void MyFrame::OnPageSetup(wxCommandEvent& WXUNUSED(event))
 #else
    wxGetApp().SetPrintMode(wxPRINT_POSTSCRIPT);
 #endif
 #else
    wxGetApp().SetPrintMode(wxPRINT_POSTSCRIPT);
 #endif

-   wxPageSetupData data;
+   wxPageSetupDialogData data;

 
 #if defined(__WXMSW__) || defined(__WXMAC__)
    wxPageSetupDialog pageSetupDialog(this, & data);
 
 #if defined(__WXMSW__) || defined(__WXMAC__)
    wxPageSetupDialog pageSetupDialog(this, & data);


@@ -532,7 +528,7 @@ void MyFrame::OnPageSetup(wxCommandEvent& WXUNUSED(event))
 #endif
    pageSetupDialog.ShowModal();
 
 #endif
    pageSetupDialog.ShowModal();
 

-   data = pageSetupDialog.GetPageSetupData();
+   data = pageSetupDialog.GetPageSetupDialogData();

 }
 
 void MyFrame::OnPrintSetupPS(wxCommandEvent& WXUNUSED(event))
 }
 
 void MyFrame::OnPrintSetupPS(wxCommandEvent& WXUNUSED(event))