wxMediaCtrl API changes for 2.5.x/2.6

[wxWidgets.git] / samples / mobile / styles / styles.cpp

diff --git a/samples/mobile/styles/styles.cpp b/samples/mobile/styles/styles.cpp
index 3c7de87fbcef5ccb7a4547513c8e36b3f90e6734..ddef0c19e6890759602a1e93e3868bae0189591f 100644 (file)
--- a/samples/mobile/styles/styles.cpp
+++ b/samples/mobile/styles/styles.cpp
@@ -2,7 +2,7 @@
 // Name:        styles.cpp
 // Author:      Robert Roebling
 // Created:     04/07/02
 // Name:        styles.cpp
 // Author:      Robert Roebling
 // Created:     04/07/02

-// Copyright:   
+// Copyright:

 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__


@@ -37,45 +37,47 @@ MyFrame::MyFrame( wxWindow *parent, wxWindowID id, const wxString &title,
 {
     // Create menu and status bar.
     CreateMyMenuBar();
 {
     // Create menu and status bar.
     CreateMyMenuBar();

+#if wxUSE_STATUSBAR

     CreateStatusBar(1);
     CreateStatusBar(1);

-    SetStatusText( "Welcome to Styles!" );
-    
+    SetStatusText( _T("Welcome to Styles!") );
+#endif // wxUSE_STATUSBAR
+

     wxImage image;
     wxImage image;

-    image.LoadFile( "marble.jpg", wxBITMAP_TYPE_JPEG );
-    
+    image.LoadFile( _T("marble.jpg"), wxBITMAP_TYPE_JPEG );
+

     wxBitmap bitmap( image );
 #ifdef __WXUNIVERSAL__
     SetBackground( bitmap, 0, wxTILE );
 #endif
     wxBitmap bitmap( image );
 #ifdef __WXUNIVERSAL__
     SetBackground( bitmap, 0, wxTILE );
 #endif

-    
-    new wxStaticText( this, -1, "This is text", wxPoint( 20,50 ) );
-    
-    new wxCheckBox( this, -1, "This is a checkbox", wxPoint( 20,70 ) );
+
+    new wxStaticText( this, wxID_ANY, _T("This is text"), wxPoint( 20,50 ) );
+
+    new wxCheckBox( this, wxID_ANY, _T("This is a checkbox"), wxPoint( 20,70 ) );

 }
 
 void MyFrame::CreateMyMenuBar()
 {
     wxMenu *file_menu = new wxMenu;
 }
 
 void MyFrame::CreateMyMenuBar()
 {
     wxMenu *file_menu = new wxMenu;

-    file_menu->Append( ID_ABOUT, "About...", "Program info" );
+    file_menu->Append( ID_ABOUT, _T("About..."), _T("Program info") );

     file_menu->AppendSeparator();
     file_menu->AppendSeparator();

-    file_menu->Append( ID_QUIT, "Quit...", "Quit program" );
+    file_menu->Append( ID_QUIT, _T("Quit..."), _T("Quit program") );

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

-    menu_bar->Append( file_menu, "&File" );
-    
+    menu_bar->Append( file_menu, _T("&File") );
+

     SetMenuBar( menu_bar );
 }
 
     SetMenuBar( menu_bar );
 }
 

-void MyFrame::OnAbout( wxCommandEvent &event )
+void MyFrame::OnAbout( wxCommandEvent &WXUNUSED(event) )

 {
 }
 
 {
 }
 

-void MyFrame::OnQuit( wxCommandEvent &event )
+void MyFrame::OnQuit( wxCommandEvent &WXUNUSED(event) )

 {
 {

-     Close( TRUE );
+     Close( true );

 }
 
 }
 

-void MyFrame::OnCloseWindow( wxCloseEvent &event )
+void MyFrame::OnCloseWindow( wxCloseEvent &WXUNUSED(event) )

 {
     Destroy();
 }
 {
     Destroy();
 }


@@ -86,21 +88,17 @@ void MyFrame::OnCloseWindow( wxCloseEvent &event )
 
 IMPLEMENT_APP(MyApp)
 
 
 IMPLEMENT_APP(MyApp)
 

-MyApp::MyApp()
-{
-}
-

 bool MyApp::OnInit()
 {
     wxInitAllImageHandlers();
 
 bool MyApp::OnInit()
 {
     wxInitAllImageHandlers();
 

-    SetVendorName("Free world");
-    SetAppName("Styles");
-    
-    MyFrame *frame = new MyFrame( NULL, -1, "Styles", wxPoint(20,20), wxSize(500,340) );
-    frame->Show( TRUE );
-    
-    return TRUE;
+    SetVendorName(_T("Free world"));
+    SetAppName(_T("Styles"));
+
+    MyFrame *frame = new MyFrame( NULL, wxID_ANY, _T("Styles"), wxPoint(20,20), wxSize(500,340) );
+    frame->Show( true );
+
+    return true;

 }
 
 int MyApp::OnExit()
 }
 
 int MyApp::OnExit()