projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove sm_cocoaDelegate singleton. We need per-instance data anyway so we
[wxWidgets.git]
/
samples
/
mobile
/
styles
/
styles.cpp
diff --git
a/samples/mobile/styles/styles.cpp
b/samples/mobile/styles/styles.cpp
index 14bc75339072e383c569b1771cf76f745a0490a8..45dd6623322629e401823f2501a0a0915ae68cbe 100644
(file)
--- a/
samples/mobile/styles/styles.cpp
+++ b/
samples/mobile/styles/styles.cpp
@@
-2,13
+2,9
@@
// Name: styles.cpp
// Author: Robert Roebling
// Created: 04/07/02
// Name: styles.cpp
// Author: Robert Roebling
// Created: 04/07/02
-// Copyright:
+// Copyright:
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
- #pragma implementation "styles.cpp"
-#endif
-
// For compilers that support precompilation
#include "wx/wxprec.h"
// For compilers that support precompilation
#include "wx/wxprec.h"
@@
-37,19
+33,21
@@
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);
SetStatusText( _T("Welcome to Styles!") );
CreateStatusBar(1);
SetStatusText( _T("Welcome to Styles!") );
-
+#endif // wxUSE_STATUSBAR
+
wxImage image;
image.LoadFile( _T("marble.jpg"), wxBITMAP_TYPE_JPEG );
wxImage image;
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, wxID_ANY, _T("This is text"), wxPoint( 20,50 ) );
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 ) );
}
new wxCheckBox( this, wxID_ANY, _T("This is a checkbox"), wxPoint( 20,70 ) );
}
@@
-62,7
+60,7
@@
void MyFrame::CreateMyMenuBar()
wxMenuBar *menu_bar = new wxMenuBar();
menu_bar->Append( file_menu, _T("&File") );
wxMenuBar *menu_bar = new wxMenuBar();
menu_bar->Append( file_menu, _T("&File") );
-
+
SetMenuBar( menu_bar );
}
SetMenuBar( menu_bar );
}
@@
-86,20
+84,16
@@
void MyFrame::OnCloseWindow( wxCloseEvent &WXUNUSED(event) )
IMPLEMENT_APP(MyApp)
IMPLEMENT_APP(MyApp)
-MyApp::MyApp()
-{
-}
-
bool MyApp::OnInit()
{
wxInitAllImageHandlers();
SetVendorName(_T("Free world"));
SetAppName(_T("Styles"));
bool MyApp::OnInit()
{
wxInitAllImageHandlers();
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 );
MyFrame *frame = new MyFrame( NULL, wxID_ANY, _T("Styles"), wxPoint(20,20), wxSize(500,340) );
frame->Show( true );
-
+
return true;
}
return true;
}