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

USE_xxx constants renamed to wxUSE_xxx. This is an incompatible change, you

Browse Source 
must recompile everything after upgrading!


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@774 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
1998-09-25 13:28:52 +00:00
parent d069d02e1e
commit 47d67540a0
166 changed files with 1374 additions and 1314 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
samples/dialogs/dialogs.cpp
View File

@@ -31,7 +31,7 @@
#include <wx/fontdlg.h>
#include <wx/choicdlg.h>
#if !defined(__WXMSW__) || USE_GENERIC_DIALOGS_IN_MSW
#if !defined(__WXMSW__) || wxUSE_GENERIC_DIALOGS_IN_MSW
#include <wx/generic/colrdlgg.h>
#include <wx/generic/fontdlgg.h>
#endif
@@ -60,14 +60,14 @@ bool MyApp::OnInit(void)
file_menu->Append(DIALOGS_CHOOSE_COLOUR, "&Choose colour");
#if !defined(__WXMSW__) || USE_GENERIC_DIALOGS_IN_MSW
#if !defined(__WXMSW__) || wxUSE_GENERIC_DIALOGS_IN_MSW
file_menu->Append(DIALOGS_CHOOSE_COLOUR_GENERIC, "Choose colour (&generic)");
#endif
file_menu->AppendSeparator();
file_menu->Append(DIALOGS_CHOOSE_FONT, "Choose &font");
#if !defined(__WXMSW__) || USE_GENERIC_DIALOGS_IN_MSW
#if !defined(__WXMSW__) || wxUSE_GENERIC_DIALOGS_IN_MSW
file_menu->Append(DIALOGS_CHOOSE_FONT_GENERIC, "Choose f&ont (generic)");
#endif
@@ -147,7 +147,7 @@ void MyFrame::ChooseFont(wxCommandEvent& WXUNUSED(event) )
dialog->Close();
}
#if !defined(__WXMSW__) || USE_GENERIC_DIALOGS_IN_MSW
#if !defined(__WXMSW__) || wxUSE_GENERIC_DIALOGS_IN_MSW
void MyFrame::ChooseColourGeneric(wxCommandEvent& WXUNUSED(event))
{
wxColourData data;
@@ -292,7 +292,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
EVT_MENU(DIALOGS_FILE_OPEN, MyFrame::FileOpen)
EVT_MENU(DIALOGS_FILE_SAVE, MyFrame::FileSave)
EVT_MENU(DIALOGS_DIR_CHOOSE, MyFrame::DirChoose)
#if !defined(__WXMSW__) || USE_GENERIC_DIALOGS_IN_MSW
#if !defined(__WXMSW__) || wxUSE_GENERIC_DIALOGS_IN_MSW
EVT_MENU(DIALOGS_CHOOSE_COLOUR_GENERIC, MyFrame::ChooseColourGeneric)
EVT_MENU(DIALOGS_CHOOSE_FONT_GENERIC, MyFrame::ChooseFontGeneric)
#endif

2
samples/dialogs/dialogs.h
View File

@@ -37,7 +37,7 @@ class MyFrame: public wxFrame
void FileSave(wxCommandEvent& event);
void DirChoose(wxCommandEvent& event);
#if !defined(__WXMSW__) || USE_GENERIC_DIALOGS_IN_MSW
#if !defined(__WXMSW__) || wxUSE_GENERIC_DIALOGS_IN_MSW
void ChooseColourGeneric(wxCommandEvent& event);
void ChooseFontGeneric(wxCommandEvent& event);
#endif

2
samples/docview/doc.cpp
View File

@@ -25,7 +25,7 @@
#endif
#if !USE_DOC_VIEW_ARCHITECTURE
#error You must set USE_DOC_VIEW_ARCHITECTURE to 1 in wx_setup.h!
#error You must set wxUSE_DOC_VIEW_ARCHITECTURE to 1 in wx_setup.h!
#endif
#include "doc.h"

2
samples/docview/docview.cpp
View File

@@ -32,7 +32,7 @@
#endif
#if !USE_DOC_VIEW_ARCHITECTURE
#error You must set USE_DOC_VIEW_ARCHITECTURE to 1 in wx_setup.h!
#error You must set wxUSE_DOC_VIEW_ARCHITECTURE to 1 in wx_setup.h!
#endif
#include "wx/docview.h"

2
samples/docview/view.cpp
View File

@@ -25,7 +25,7 @@
#endif
#if !USE_DOC_VIEW_ARCHITECTURE
#error You must set USE_DOC_VIEW_ARCHITECTURE to 1 in wx_setup.h!
#error You must set wxUSE_DOC_VIEW_ARCHITECTURE to 1 in wx_setup.h!
#endif
#include "docview.h"

2
samples/docvwmdi/doc.cpp
View File

@@ -25,7 +25,7 @@
#endif
#if !USE_DOC_VIEW_ARCHITECTURE
#error You must set USE_DOC_VIEW_ARCHITECTURE to 1 in wx_setup.h!
#error You must set wxUSE_DOC_VIEW_ARCHITECTURE to 1 in wx_setup.h!
#endif
#include "doc.h"

2
samples/docvwmdi/docview.cpp
View File

@@ -30,7 +30,7 @@
#endif
#if !USE_DOC_VIEW_ARCHITECTURE
#error You must set USE_DOC_VIEW_ARCHITECTURE to 1 in wx_setup.h!
#error You must set wxUSE_DOC_VIEW_ARCHITECTURE to 1 in wx_setup.h!
#endif
#include "docview.h"

2
samples/docvwmdi/view.cpp
View File

@@ -25,7 +25,7 @@
#endif
#if !USE_DOC_VIEW_ARCHITECTURE
#error You must set USE_DOC_VIEW_ARCHITECTURE to 1 in wx_setup.h!
#error You must set wxUSE_DOC_VIEW_ARCHITECTURE to 1 in wx_setup.h!
#endif
#include "docview.h"

2
samples/layout/layout.cpp
View File

@@ -21,7 +21,7 @@
#endif
#if !USE_CONSTRAINTS
#error You must set USE_CONSTRAINTS to 1 in wx_setup.h!
#error You must set wxUSE_CONSTRAINTS to 1 in wx_setup.h!
#endif
#include <ctype.h>

45
samples/minimal/minimal.cpp
View File

@@ -70,6 +70,9 @@ public:
void OnQuit(wxCommandEvent& event);
void OnAbout(wxCommandEvent& event);
void OnPopupMenu(wxCommandEvent& event);
void OnRightDown(wxMouseEvent& event);
private:
// any class wishing to process wxWindows events must use this macro
DECLARE_EVENT_TABLE()
@@ -85,6 +88,8 @@ enum
// menu items
Minimal_Quit = 1,
Minimal_About,
Minimal_Test1,
Minimal_Test2,
// controls start here (the numbers are, of course, arbitrary)
Minimal_Text = 1000,
@@ -100,6 +105,10 @@ enum
BEGIN_EVENT_TABLE(MyFrame, wxFrame)
EVT_MENU(Minimal_Quit, MyFrame::OnQuit)
EVT_MENU(Minimal_About, MyFrame::OnAbout)
EVT_MENU_RANGE(Minimal_Test1, Minimal_Test2, MyFrame::OnPopupMenu)
EVT_RIGHT_DOWN(MyFrame::OnRightDown)
END_EVENT_TABLE()
// Create a new application object: this macro will allow wxWindows to create
@@ -161,17 +170,8 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
SetMenuBar(menuBar);
// create a status bar just for fun (by default with 1 pane only)
CreateStatusBar();
CreateStatusBar(2);
SetStatusText("Welcome to wxWindows!");
// now create some controls
// a panel first - if there were several controls, it would allow us to
// navigate between them from the keyboard
wxPanel *panel = new wxPanel(this, -1, wxPoint(0, 0), wxSize(400, 200));
// and a static control whose parent is the panel
(void)new wxStaticText(panel, -1, "Hello, world!", wxPoint(10, 10));
}
@@ -188,3 +188,28 @@ void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
wxMessageBox("This is a minimal sample\nA second line in the message box",
"About Minimal", wxOK | wxICON_INFORMATION, this);
}
void MyFrame::OnPopupMenu(wxCommandEvent& event)
{
wxString str;
str.Printf("Test%d clicked.", event.GetId() == Minimal_Test1 ? 1 : 2);
SetStatusText(str, 1);
}
void MyFrame::OnRightDown(wxMouseEvent& event)
{
class MyMenu : public wxMenu
{
public:
MyMenu()
{
Append(Minimal_Test1, "Test&1");
AppendSeparator();
Append(Minimal_Test2, "Test&2");
}
~MyMenu() { printf("menu destroyed"); }
} *menu = new MyMenu;
PopupMenu(menu, event.GetX(), event.GetY());
}

2
samples/printing/printing.cpp
View File

@@ -26,7 +26,7 @@
#endif
#if !USE_PRINTING_ARCHITECTURE
#error You must set USE_PRINTING_ARCHITECTURE to 1 in wx_setup.h to compile this demo.
#error You must set wxUSE_PRINTING_ARCHITECTURE to 1 in wx_setup.h to compile this demo.
#endif
#include <ctype.h>

2
samples/toolbar/test.cpp
View File

@@ -161,7 +161,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
EVT_MENU(wxID_HELP, MyFrame::OnAbout)
EVT_CLOSE(MyFrame::OnCloseWindow)
EVT_TOOL_RANGE(wxID_OPEN, wxID_PASTE, MyFrame::OnToolLeftClick)
EVT_TOOL_ENTER(ID_TOOLBAR, MyFrame::OnToolEnter)
EVT_TOOL_ENTER(wxID_OPEN, MyFrame::OnToolEnter)
END_EVENT_TABLE()
// Define my frame constructor