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

Resource sample works now, apart from

Browse Source 
wxRadioBox, which is #ifdef 0 in
   resource.cpp
  Fixed tiny thing in resource.cpp


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@544 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
1998-08-15 12:06:45 +00:00
parent c33c405087
commit 8d71b5552e
6 changed files with 45 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
samples/resource/dialog1.wxr
View File

@@ -10,7 +10,7 @@ static char *dialog1 = "dialog(name = 'dialog1',\
control = [wxRadioBox, 'Radiobox', 'wxHSCROLL | wxVERTICAL | wxVERTICAL_LABEL', 'radiobox2', 24, 23, 111, 63, ['One', 'Two', 'Three', 'Four'], 2,\
[11, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0],\
[11, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0]],\
control = [wxMultiText, 'Multitext', 'wxVERTICAL_LABEL', 'multitext3', 156, 126, 200, 70, 'wxWindows is a multi-platform, GUI toolkit.',\
control = [wxMultiText, 'Multitext', 'wxTE_MULTILINE', 'multitext3', 156, 126, 200, 70, 'wxWindows is a multi-platform, GUI toolkit.',\
[11, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0],\
[11, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0]],\
control = [wxListBox, 'Listbox', 'wxVERTICAL_LABEL', 'listbox4', 156, 26, 200, 80, ['Apples', 'Pears', 'Bananas'], 'wxSINGLE',\

28
samples/resource/resource.cpp
View File

@@ -109,7 +109,7 @@ bool MyApp::OnInit(void)
frame->SetMenuBar(menu_bar);
// Make a panel
frame->panel = new wxWindow(frame, -1, wxPoint(0, 0), wxSize(400, 400), 0, "MyMainFrame");
frame->panel = new MyPanel(frame, -1, wxPoint(0, 0), wxSize(400, 400), 0, "MyMainFrame");
frame->Show(TRUE);
SetTopWindow(frame);
@@ -117,6 +117,24 @@ bool MyApp::OnInit(void)
return TRUE;
}
BEGIN_EVENT_TABLE(MyPanel, wxPanel)
EVT_LEFT_DOWN( MyPanel::OnClick)
END_EVENT_TABLE()
MyPanel::MyPanel( wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size,
int style, const wxString &name ) :
wxPanel( parent, id, pos, size, style, name )
{
}
void MyPanel::OnClick( wxMouseEvent &WXUNUSED(event) )
{
MyFrame *frame = (MyFrame*)(wxTheApp->GetTopWindow());
wxCommandEvent event;
frame->OnTest1( event );
}
BEGIN_EVENT_TABLE(MyFrame, wxFrame)
EVT_MENU(RESOURCE_QUIT, MyFrame::OnQuit)
EVT_MENU(RESOURCE_TEST1, MyFrame::OnTest1)
@@ -129,12 +147,12 @@ MyFrame::MyFrame(wxWindow *parent, const wxWindowID id, const wxString& title, c
panel = NULL;
}
void MyFrame::OnQuit(wxCommandEvent& event)
void MyFrame::OnQuit( wxCommandEvent& WXUNUSED(event) )
{
Close(TRUE);
}
void MyFrame::OnTest1(wxCommandEvent& event)
void MyFrame::OnTest1(wxCommandEvent& WXUNUSED(event) )
{
MyDialog *dialog = new MyDialog;
if (dialog->LoadFromResource(this, "dialog1"))
@@ -161,12 +179,12 @@ BEGIN_EVENT_TABLE(MyDialog, wxDialog)
END_EVENT_TABLE()
void MyDialog::OnOk(wxCommandEvent& event)
void MyDialog::OnOk(wxCommandEvent& WXUNUSED(event) )
{
EndModal(RESOURCE_OK);
}
void MyDialog::OnCancel(wxCommandEvent& event)
void MyDialog::OnCancel(wxCommandEvent& WXUNUSED(event) )
{
EndModal(RESOURCE_CANCEL);
}

10
samples/resource/resource.h
View File

@@ -21,6 +21,16 @@ class MyApp: public wxApp
bool OnInit(void);
};
class MyPanel: public wxPanel
{
public:
MyPanel( wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size,
int style, const wxString &name );
void OnClick(wxMouseEvent &event);
DECLARE_EVENT_TABLE()
};
class MyFrame: public wxFrame
{
public:

2
src/common/resource.cpp
View File

@@ -901,7 +901,7 @@ wxItemResource *wxResourceInterpretControl(wxResourceTable& table, PrologExpr *e
}
}
#endif
else if (controlType == "wxText" || controlType == "wxTextCtrl")
else if (controlType == "wxText" || controlType == "wxTextCtrl" || controlType == "wxMultiText")
{
// Check for default value
if (expr->Nth(count) && ((expr->Nth(count)->Type() == PrologString) || (expr->Nth(count)->Type() == PrologWord)))

7
src/gtk/app.cpp
View File

@@ -21,6 +21,7 @@
#include "wx/memory.h"
#include "wx/font.h"
#include "wx/settings.h"
#include "wx/resource.h"
#include "unistd.h"
@@ -257,6 +258,8 @@ void wxApp::CommonInit(void)
wxInitializeStockLists();
wxInitializeStockObjects();
wxInitializeResourceSystem();
// For PostScript printing
#if USE_POSTSCRIPT
wxInitializePrintSetupData();
@@ -270,8 +273,6 @@ void wxApp::CommonInit(void)
g_globalCursor = new wxCursor;
*/
// wxInitializeStockObjects();
};
void wxApp::CommonCleanUp(void)
@@ -288,6 +289,8 @@ void wxApp::CommonCleanUp(void)
wxDeleteStockLists();
wxCleanUpResourceSystem();
wxSystemSettings::Done();
};

7
src/gtk1/app.cpp
View File

@@ -21,6 +21,7 @@
#include "wx/memory.h"
#include "wx/font.h"
#include "wx/settings.h"
#include "wx/resource.h"
#include "unistd.h"
@@ -257,6 +258,8 @@ void wxApp::CommonInit(void)
wxInitializeStockLists();
wxInitializeStockObjects();
wxInitializeResourceSystem();
// For PostScript printing
#if USE_POSTSCRIPT
wxInitializePrintSetupData();
@@ -270,8 +273,6 @@ void wxApp::CommonInit(void)
g_globalCursor = new wxCursor;
*/
// wxInitializeStockObjects();
};
void wxApp::CommonCleanUp(void)
@@ -288,6 +289,8 @@ void wxApp::CommonCleanUp(void)
wxDeleteStockLists();
wxCleanUpResourceSystem();
wxSystemSettings::Done();
};