Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

some more SetIcon() calls added; cleanup indentation of some samples

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58745 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Francesco Montorsi
2009-02-08 01:20:35 +00:00
parent 41f02b9acc
commit 197ab43d72
10 changed files with 356 additions and 277 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
samples/html/about/about.cpp
View File

@@ -1,6 +1,12 @@
/////////////////////////////////////////////////////////////////////////////
// Name: test.cpp
// Purpose: wxHtml testing example
// Name: about.cpp
// Purpose: wxHtml sample: about dialog test
// Author: ?
// Modified by:
// Created: ?
// RCS-ID: $Id$
// Copyright: (c) wxWidgets team
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// For compilers that support precompilation, includes "wx/wx.h".
@@ -21,6 +27,11 @@
#include "wx/wxhtml.h"
#include "wx/statline.h"
#ifndef __WXMSW__
#include "../../sample.xpm"
#endif
// ----------------------------------------------------------------------------
// private classes
// ----------------------------------------------------------------------------
@@ -109,6 +120,8 @@ bool MyApp::OnInit()
MyFrame::MyFrame(const wxString& title)
: wxFrame((wxFrame *)NULL, wxID_ANY, title)
{
SetIcon(wxICON(sample));
// create a menu bar
wxMenu *menuFile = new wxMenu;

105
samples/html/help/help.cpp
View File

@@ -1,6 +1,12 @@
/////////////////////////////////////////////////////////////////////////////
// Name: test.cpp
// Purpose: wxHtml testing example
// Name: help.cpp
// Purpose: wxHtml sample: help test
// Author: ?
// Modified by:
// Created: ?
// RCS-ID: $Id$
// Copyright: (c) wxWidgets team
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// For compilers that support precompilation, includes "wx/wx.h".
@@ -22,15 +28,20 @@
#include "wx/filesys.h"
#include "wx/fs_zip.h"
#ifndef __WXMSW__
#include "../../sample.xpm"
#endif
// ----------------------------------------------------------------------------
// private classes
// ----------------------------------------------------------------------------
// Define a new application type, each program should derive a class from wxApp
class MyApp : public wxApp
{
public:
class MyApp : public wxApp
{
public:
// override base class virtuals
// ----------------------------
@@ -38,14 +49,14 @@
// initialization (doing it here and not in the ctor allows to have an error
// return: if OnInit() returns false, the application terminates)
virtual bool OnInit();
};
};
// Define a new frame type: this is going to be our main frame
class MyFrame : public wxFrame
{
public:
class MyFrame : public wxFrame
{
public:
// ctor(s)
MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size);
@@ -53,24 +64,24 @@
void OnQuit(wxCommandEvent& event);
void OnHelp(wxCommandEvent& event);
void OnClose(wxCloseEvent& event);
private:
private:
wxHtmlHelpController help;
// any class wishing to process wxWidgets events must use this macro
DECLARE_EVENT_TABLE()
};
};
// ----------------------------------------------------------------------------
// constants
// ----------------------------------------------------------------------------
// IDs for the controls and the menu commands
enum
{
enum
{
// menu items
Minimal_Quit = 1,
Minimal_Help
};
};
// ----------------------------------------------------------------------------
// event tables and other macros for wxWidgets
@@ -79,29 +90,29 @@
// the event tables connect the wxWidgets events with the functions (event
// handlers) which process them. It can be also done at run-time, but for the
// simple menu events like this the static method is much simpler.
BEGIN_EVENT_TABLE(MyFrame, wxFrame)
BEGIN_EVENT_TABLE(MyFrame, wxFrame)
EVT_MENU(Minimal_Quit, MyFrame::OnQuit)
EVT_MENU(Minimal_Help, MyFrame::OnHelp)
EVT_CLOSE(MyFrame::OnClose)
END_EVENT_TABLE()
END_EVENT_TABLE()
// Create a new application object: this macro will allow wxWidgets to create
// the application object during program execution (it's better than using a
// static object for many reasons) and also declares the accessor function
// wxGetApp() which will return the reference of the right type (i.e. MyApp and
// not wxApp)
IMPLEMENT_APP(MyApp)
// Create a new application object: this macro will allow wxWidgets to create
// the application object during program execution (it's better than using a
// static object for many reasons) and also declares the accessor function
// wxGetApp() which will return the reference of the right type (i.e. MyApp and
// not wxApp)
IMPLEMENT_APP(MyApp)
// ============================================================================
// implementation
// ============================================================================
// ============================================================================
// implementation
// ============================================================================
// ----------------------------------------------------------------------------
// the application class
// ----------------------------------------------------------------------------
// `Main program' equivalent: the program execution "starts" here
bool MyApp::OnInit()
{
// ----------------------------------------------------------------------------
// the application class
// ----------------------------------------------------------------------------
// `Main program' equivalent: the program execution "starts" here
bool MyApp::OnInit()
{
if ( !wxApp::OnInit() )
return false;
@@ -126,7 +137,7 @@
// loop and the application will run. If we returned false here, the
// application would exit immediately.
return true;
}
}
// ----------------------------------------------------------------------------
// main frame
@@ -134,10 +145,12 @@
// frame constructor
MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
: wxFrame((wxFrame *)NULL, wxID_ANY, title, pos, size),
help(wxHF_DEFAULT_STYLE | wxHF_OPEN_FILES)
{
{
SetIcon(wxICON(sample));
// create a menu bar
wxMenu *menuFile = new wxMenu;
@@ -160,24 +173,24 @@
ret = help.AddBook(wxFileName(wxT("helpfiles/another.hhp"), wxPATH_UNIX));
if (! ret)
wxMessageBox(_("Failed adding book helpfiles/another.hhp"));
}
}
// event handlers
void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
{
void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
{
// true is to force the frame to close
Close(true);
}
}
void MyFrame::OnHelp(wxCommandEvent& WXUNUSED(event))
{
void MyFrame::OnHelp(wxCommandEvent& WXUNUSED(event))
{
help.Display(wxT("Test HELPFILE"));
}
}
void MyFrame::OnClose(wxCloseEvent& event)
{
void MyFrame::OnClose(wxCloseEvent& event)
{
// Close the help frame; this will cause the config data to
// get written.
if ( help.GetFrame() ) // returns NULL if no help frame active
@@ -185,11 +198,7 @@
// now we can safely delete the config pointer
event.Skip();
delete wxConfig::Set(NULL);
}
}

20
samples/html/helpview/helpview.cpp
View File

@@ -1,9 +1,16 @@
/////////////////////////////////////////////////////////////////////////////
// Name: helpview.cpp
// Purpose: wxHtml help browser
// Name: printing.cpp
// Purpose: wxHtml sample: help browser
// Author: ?
// Modified by:
// Created: ?
// RCS-ID: $Id$
// Copyright: (c) wxWidgets team
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// Please note: see utils/helpview for a more fully-featured
// standalone help browser.
/////////////////////////////////////////////////////////////////////////////
// For compilers that support precompilation, includes "wx/wx.h".
#include "wx/wxprec.h"
@@ -24,15 +31,15 @@
#include "wx/log.h"
#include "wx/filedlg.h"
// ----------------------------------------------------------------------------
// private classes
// ----------------------------------------------------------------------------
// Define a new application type, each program should derive a class from wxApp
class MyApp : public wxApp
{
public:
public:
// override base class virtuals
// ----------------------------
@@ -43,7 +50,7 @@ class MyApp : public wxApp
virtual bool OnInit();
virtual int OnExit();
private:
private:
wxHtmlHelpController *help;
};
@@ -84,7 +91,6 @@ bool MyApp::OnInit()
return true;
}
int MyApp::OnExit()
{
delete help;

8
samples/html/htmlctrl/htmlctrl.cpp
View File

@@ -32,6 +32,10 @@
#include "wx/html/webkit.h"
#ifndef __WXMSW__
#include "../../sample.xpm"
#endif
// ----------------------------------------------------------------------------
// resources
// ----------------------------------------------------------------------------
@@ -47,7 +51,7 @@ enum {
ID_OPEN = wxID_HIGHEST + 8,
ID_SAVE = wxID_HIGHEST + 9,
ID_SET_SOURCE = wxID_HIGHEST + 10
};
};
// ----------------------------------------------------------------------------
// private classes
@@ -149,6 +153,8 @@ bool MyApp::OnInit()
MyFrame::MyFrame(const wxString& title)
: wxFrame(NULL, wxID_ANY, title, wxDefaultPosition, wxSize(500,500))
{
SetIcon(wxICON(sample));
wxMenuBar* myBar = new wxMenuBar();
wxMenu* fileMenu = new wxMenu;
fileMenu->Append(ID_OPEN, _("&Open"));

24
samples/html/printing/printing.cpp
View File

@@ -1,7 +1,12 @@
/////////////////////////////////////////////////////////////////////////////
// Name: printimg.cpp
// Purpose: wxHtmlEasyPrinting testing example
// Licence: wxWindows Licence
// Name: printing.cpp
// Purpose: wxHtml sample: wxHtmlEasyPrinting test
// Author: ?
// Modified by:
// Created: ?
// RCS-ID: $Id$
// Copyright: (c) wxWidgets team
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
@@ -22,6 +27,10 @@
#include "wx/html/htmlwin.h"
#include "wx/html/htmprint.h"
#ifndef __WXMSW__
#include "../../sample.xpm"
#endif
// ----------------------------------------------------------------------------
// private classes
@@ -30,7 +39,7 @@
// Define a new application type, each program should derive a class from wxApp
class MyApp : public wxApp
{
public:
public:
// override base class virtuals
// ----------------------------
@@ -44,7 +53,7 @@ class MyApp : public wxApp
// Define a new frame type: this is going to be our main frame
class MyFrame : public wxFrame
{
public:
public:
// ctor and dtor
MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size);
@@ -64,10 +73,11 @@ class MyFrame : public wxFrame
void OnPrintHuge(wxCommandEvent& event);
private:
private:
wxHtmlWindow *m_Html;
wxHtmlEasyPrinting *m_Prn;
wxString m_Name;
// any class wishing to process wxWidgets events must use this macro
DECLARE_EVENT_TABLE()
};
@@ -165,6 +175,8 @@ bool MyApp::OnInit()
MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
: wxFrame((wxFrame *)NULL, wxID_ANY, title, pos, size)
{
SetIcon(wxICON(sample));
// create a menu bar
wxMenu *menuFile = new wxMenu;
menuFile->Append(Minimal_Open, _("Open...\tCtrl-O"));

108
samples/html/virtual/virtual.cpp
View File

@@ -1,7 +1,12 @@
/////////////////////////////////////////////////////////////////////////////
// Name: virtua;.cpp
// Purpose: wxHtml testing example
// demonstrates virtual file systems feature
// Name: virtual.cpp
// Purpose: wxHtml sample: demonstrates virtual file systems feature
// Author: ?
// Modified by:
// Created: ?
// RCS-ID: $Id$
// Copyright: (c) wxWidgets team
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// For compilers that support precompilation, includes "wx/wx.h".
@@ -17,9 +22,11 @@
#include "wx/wx.h"
#endif
#include "wx/html/htmlwin.h"
#ifndef __WXMSW__
#include "../../sample.xpm"
#endif
// new handler class:
@@ -27,6 +34,9 @@
#include "wx/mstream.h"
// ----------------------------------------------------------------------------
// MyVFS
// ----------------------------------------------------------------------------
class MyVFS : public wxFileSystemHandler
{
@@ -37,14 +47,11 @@ public:
bool CanOpen(const wxString& location);
};
bool MyVFS::CanOpen(const wxString& location)
{
return (GetProtocol(location) == wxT("myVFS"));
}
wxFSFile* MyVFS::OpenFile(wxFileSystem& WXUNUSED(fs), const wxString& location)
{
wxFSFile *f;
@@ -79,9 +86,9 @@ wxFSFile* MyVFS::OpenFile(wxFileSystem& WXUNUSED(fs), const wxString& location)
// ----------------------------------------------------------------------------
// Define a new application type, each program should derive a class from wxApp
class MyApp : public wxApp
{
public:
class MyApp : public wxApp
{
public:
// override base class virtuals
// ----------------------------
@@ -89,12 +96,12 @@ wxFSFile* MyVFS::OpenFile(wxFileSystem& WXUNUSED(fs), const wxString& location)
// initialization (doing it here and not in the ctor allows to have an error
// return: if OnInit() returns false, the application terminates)
virtual bool OnInit();
};
};
// Define a new frame type: this is going to be our main frame
class MyFrame : public wxFrame
{
public:
class MyFrame : public wxFrame
{
public:
// ctor(s)
MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size);
@@ -103,18 +110,18 @@ wxFSFile* MyVFS::OpenFile(wxFileSystem& WXUNUSED(fs), const wxString& location)
void OnBack(wxCommandEvent& event);
void OnForward(wxCommandEvent& event);
private:
private:
// any class wishing to process wxWidgets events must use this macro
DECLARE_EVENT_TABLE()
};
};
// ----------------------------------------------------------------------------
// constants
// ----------------------------------------------------------------------------
// IDs for the controls and the menu commands
enum
{
enum
{
// menu items
Minimal_Quit = 1,
Minimal_Back,
@@ -122,7 +129,7 @@ wxFSFile* MyVFS::OpenFile(wxFileSystem& WXUNUSED(fs), const wxString& location)
// controls start here (the numbers are, of course, arbitrary)
Minimal_Text = 1000
};
};
// ----------------------------------------------------------------------------
// event tables and other macros for wxWidgets
@@ -131,30 +138,30 @@ wxFSFile* MyVFS::OpenFile(wxFileSystem& WXUNUSED(fs), const wxString& location)
// the event tables connect the wxWidgets events with the functions (event
// handlers) which process them. It can be also done at run-time, but for the
// simple menu events like this the static method is much simpler.
BEGIN_EVENT_TABLE(MyFrame, wxFrame)
BEGIN_EVENT_TABLE(MyFrame, wxFrame)
EVT_MENU(Minimal_Quit, MyFrame::OnQuit)
EVT_MENU(Minimal_Back, MyFrame::OnBack)
EVT_MENU(Minimal_Forward, MyFrame::OnForward)
END_EVENT_TABLE()
END_EVENT_TABLE()
// Create a new application object: this macro will allow wxWidgets to create
// the application object during program execution (it's better than using a
// static object for many reasons) and also declares the accessor function
// wxGetApp() which will return the reference of the right type (i.e. MyApp and
// not wxApp)
IMPLEMENT_APP(MyApp)
// Create a new application object: this macro will allow wxWidgets to create
// the application object during program execution (it's better than using a
// static object for many reasons) and also declares the accessor function
// wxGetApp() which will return the reference of the right type (i.e. MyApp and
// not wxApp)
IMPLEMENT_APP(MyApp)
// ============================================================================
// implementation
// ============================================================================
// ============================================================================
// implementation
// ============================================================================
// ----------------------------------------------------------------------------
// the application class
// ----------------------------------------------------------------------------
// ----------------------------------------------------------------------------
// the application class
// ----------------------------------------------------------------------------
// `Main program' equivalent: the program execution "starts" here
bool MyApp::OnInit()
{
// `Main program' equivalent: the program execution "starts" here
bool MyApp::OnInit()
{
if ( !wxApp::OnInit() )
return false;
@@ -172,7 +179,7 @@ wxFSFile* MyVFS::OpenFile(wxFileSystem& WXUNUSED(fs), const wxString& location)
// loop and the application will run. If we returned false here, the
// application would exit immediately.
return true;
}
}
// ----------------------------------------------------------------------------
// main frame
@@ -181,9 +188,11 @@ wxFSFile* MyVFS::OpenFile(wxFileSystem& WXUNUSED(fs), const wxString& location)
wxHtmlWindow *html;
// frame constructor
MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
: wxFrame((wxFrame *)NULL, wxID_ANY, title, pos, size)
{
{
SetIcon(wxICON(sample));
// create a menu bar
wxMenu *menuFile = new wxMenu;
wxMenu *menuNav = new wxMenu;
@@ -210,24 +219,23 @@ wxHtmlWindow *html;
html -> SetRelatedStatusBar(1);
#endif // wxUSE_STATUSBAR
html -> LoadPage(wxT("start.htm"));
}
}
// event handlers
void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
{
void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
{
// true is to force the frame to close
Close(true);
}
}
void MyFrame::OnBack(wxCommandEvent& WXUNUSED(event))
{
void MyFrame::OnBack(wxCommandEvent& WXUNUSED(event))
{
if (!html -> HistoryBack()) wxMessageBox(_("You reached prehistory era!"));
}
}
void MyFrame::OnForward(wxCommandEvent& WXUNUSED(event))
{
void MyFrame::OnForward(wxCommandEvent& WXUNUSED(event))
{
if (!html -> HistoryForward()) wxMessageBox(_("No more items in history!"));
}
}

27
samples/html/widget/widget.cpp
View File

@@ -1,7 +1,12 @@
/////////////////////////////////////////////////////////////////////////////
// Name: widget.cpp
// Purpose: wxHtml testing example
// Demonstrates embedded controls
// Name: zip.cpp
// Purpose: wxHtml sample: Demonstrates embedded controls
// Author: ?
// Modified by:
// Created: ?
// RCS-ID: $Id$
// Copyright: (c) wxWidgets team
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// For compilers that support precompilation, includes "wx/wx.h".
@@ -17,23 +22,17 @@
#include "wx/wx.h"
#endif
#include "wx/html/htmlwin.h"
#include "../../sample.xpm"
/*
TAG HANDER FOR 'MYBIND' TAG
*/
// ----------------------------------------------------------------------------
// TAG HANDER FOR 'MYBIND' TAG
// ----------------------------------------------------------------------------
#include "wx/html/m_templ.h"
TAG_HANDLER_BEGIN(MYBIND, "MYBIND")
TAG_HANDLER_PROC(tag)
@@ -182,8 +181,10 @@ wxHtmlWindow *html;
// frame constructor
MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
: wxFrame((wxFrame *)NULL, wxID_ANY, title, pos, size)
: wxFrame((wxFrame *)NULL, wxID_ANY, title, pos, size)
{
SetIcon(wxICON(sample));
// create a menu bar
wxMenu *menuFile = new wxMenu;
wxMenu *menuNav = new wxMenu;

18
samples/html/zip/zip.cpp
View File

@@ -1,6 +1,12 @@
/////////////////////////////////////////////////////////////////////////////
// Name: test.cpp
// Purpose: wxHtml testing example
// Name: zip.cpp
// Purpose: wxHtml sample
// Author: ?
// Modified by:
// Created: ?
// RCS-ID: $Id$
// Copyright: (c) wxWidgets team
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// For compilers that support precompilation, includes "wx/wx.h".
@@ -20,6 +26,10 @@
#include "wx/html/htmlwin.h"
#include "wx/fs_zip.h"
#ifndef __WXMSW__
#include "../../sample.xpm"
#endif
// ----------------------------------------------------------------------------
// private classes
// ----------------------------------------------------------------------------
@@ -133,8 +143,10 @@ wxHtmlWindow *html;
// frame constructor
MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
: wxFrame((wxFrame *)NULL, wxID_ANY, title, pos, size)
: wxFrame((wxFrame *)NULL, wxID_ANY, title, pos, size)
{
SetIcon(wxICON(sample));
// create a menu bar
wxMenu *menuFile = new wxMenu;
wxMenu *menuNav = new wxMenu;

6
samples/mobile/styles/styles.cpp
View File

@@ -17,6 +17,10 @@
// Include private headers
#include "styles.h"
#ifndef __WXMSW__
#include "../../sample.xpm"
#endif
//------------------------------------------------------------------------------
// MyFrame
//------------------------------------------------------------------------------
@@ -31,6 +35,8 @@ MyFrame::MyFrame( wxWindow *parent, wxWindowID id, const wxString &title,
const wxPoint &position, const wxSize& size, long style ) :
wxFrame( parent, id, title, position, size, style )
{
SetIcon(wxICON(sample));
// Create menu and status bar.
CreateMyMenuBar();
#if wxUSE_STATUSBAR

6
samples/mobile/wxedit/wxedit.cpp
View File

@@ -18,6 +18,10 @@
// Include private headers
#include "wxedit.h"
#ifndef __WXMSW__
#include "../../sample.xpm"
#endif
//------------------------------------------------------------------------------
// constants
//------------------------------------------------------------------------------
@@ -52,6 +56,8 @@ MyFrame::MyFrame( wxWindow *parent, wxWindowID id, const wxString &title,
const wxPoint &position, const wxSize& size, long style ) :
wxFrame( parent, id, title, position, size, style )
{
SetIcon(wxICON(sample));
// Create menu and status bar.
CreateMyMenuBar();
#if wxUSE_STATUSBAR