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

minor samples fixes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1389 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
1999-01-12 23:51:13 +00:00
parent 73c700fdee
commit 1d5b7a0be4
5 changed files with 93 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
samples/resource/resource.cpp
View File

@@ -97,18 +97,6 @@ bool MyApp::OnInit(void)
// Give it a status line
frame->CreateStatusBar(2);
/*
// Make a menubar
wxMenu *file_menu = new wxMenu;
file_menu->Append(RESOURCE_TEST1, "&Dialog box test", "Test dialog box resource");
file_menu->Append(RESOURCE_QUIT, "E&xit", "Quit program");
wxMenuBar *menu_bar = new wxMenuBar;
menu_bar->Append(file_menu, "&File");
*/
wxMenuBar *menu_bar = wxResourceCreateMenuBar("menu1");
// Associate the menu bar with the frame
@@ -123,6 +111,12 @@ bool MyApp::OnInit(void)
return TRUE;
}
MyApp::~MyApp()
{
delete dialog1;
delete menu1;
}
BEGIN_EVENT_TABLE(MyPanel, wxPanel)
EVT_LEFT_DOWN( MyPanel::OnClick)
END_EVENT_TABLE()
@@ -133,17 +127,18 @@ MyPanel::MyPanel( wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxS
{
}
void MyPanel::OnClick( wxMouseEvent &WXUNUSED(event) )
void MyPanel::OnClick( wxMouseEvent &WXUNUSED(event2) )
{
MyFrame *frame = (MyFrame*)(wxTheApp->GetTopWindow());
wxCommandEvent event;
frame->OnTest1( event );
frame->OnTestDialog( event );
}
BEGIN_EVENT_TABLE(MyFrame, wxFrame)
EVT_MENU(RESOURCE_ABOUT, MyFrame::OnAbout)
EVT_MENU(RESOURCE_QUIT, MyFrame::OnQuit)
EVT_MENU(RESOURCE_TEST1, MyFrame::OnTest1)
EVT_MENU(RESOURCE_TESTDIALOG, MyFrame::OnTestDialog)
END_EVENT_TABLE()
// Define my frame constructor
@@ -153,12 +148,19 @@ MyFrame::MyFrame(wxWindow *parent, const wxWindowID id, const wxString& title, c
panel = (wxWindow *) NULL;
}
void MyFrame::OnAbout( wxCommandEvent& WXUNUSED(event) )
{
wxMessageBox("wxWindows resource sample.\n"
"(c) Julian Smart", "About wxWindows sample",
wxICON_INFORMATION | wxOK);
}
void MyFrame::OnQuit( wxCommandEvent& WXUNUSED(event) )
{
Close(TRUE);
}
void MyFrame::OnTest1(wxCommandEvent& WXUNUSED(event) )
void MyFrame::OnTestDialog(wxCommandEvent& WXUNUSED(event) )
{
MyDialog *dialog = new MyDialog;
if (dialog->LoadFromResource(this, "dialog1"))

57
samples/resource/resource.h
View File

@@ -16,46 +16,55 @@
// Define a new application
class MyApp: public wxApp
{
public:
MyApp(void) ;
bool OnInit(void);
public:
MyApp();
virtual bool OnInit();
virtual ~MyApp();
};
class MyPanel: public wxPanel
{
public:
MyPanel( wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size,
int style, const wxString &name );
public:
MyPanel(wxWindow *parent, wxWindowID id, const wxPoint& pos,
const wxSize& size, int style, const wxString &name);
void OnClick(wxMouseEvent &event);
DECLARE_EVENT_TABLE()
private:
DECLARE_EVENT_TABLE()
};
class MyFrame: public wxFrame
{
public:
wxWindow *panel;
MyFrame(wxWindow *parent, const wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size);
bool OnClose(void);
public:
MyFrame(wxWindow *parent, const wxWindowID id, const wxString& title,
const wxPoint& pos, const wxSize& size);
bool OnClose();
void OnQuit(wxCommandEvent& event);
void OnTest1(wxCommandEvent& event);
void OnAbout(wxCommandEvent& event);
void OnTestDialog(wxCommandEvent& event);
wxWindow *panel;
DECLARE_EVENT_TABLE()
private:
DECLARE_EVENT_TABLE()
};
class MyDialog : public wxDialog
{
public:
public:
void OnOk(wxCommandEvent& event);
void OnCancel(wxCommandEvent& event);
DECLARE_EVENT_TABLE()
private:
DECLARE_EVENT_TABLE()
};
#define RESOURCE_QUIT 4
#define RESOURCE_TEST1 2
/*
#define RESOURCE_OK 1
#define RESOURCE_CANCEL 2
*/
// the values should be the same as in menu.wxr file!
enum
{
RESOURCE_TESTDIALOG = 2,
RESOURCE_QUIT = 4,
RESOURCE_ABOUT = 6
};