Applied patch #885752: "wxPoem less MSW specific + cleanup".
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25687 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
33c4f27fe5
commit
17d31882db
2 changed files with 112 additions and 178 deletions
|
|
@ -33,12 +33,15 @@ class MyCanvas: public wxWindow
|
|||
{
|
||||
public:
|
||||
MyCanvas(wxFrame *frame, wxWindowID id, const wxPoint& pos, const wxSize& size);
|
||||
~MyCanvas();
|
||||
|
||||
void OnPaint(wxPaintEvent& event);
|
||||
void OnMouseEvent(wxMouseEvent& event);
|
||||
void OnChar(wxKeyEvent& event);
|
||||
|
||||
DECLARE_EVENT_TABLE()
|
||||
private:
|
||||
wxMenu *popupMenu;
|
||||
};
|
||||
|
||||
// Define a new frame
|
||||
|
|
@ -47,7 +50,6 @@ class MainWindow: public wxFrame
|
|||
public:
|
||||
MyCanvas *canvas;
|
||||
MainWindow(wxFrame *frame, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style);
|
||||
~MainWindow();
|
||||
|
||||
void OnCloseWindow(wxCloseEvent& event);
|
||||
void OnChar(wxKeyEvent& event);
|
||||
|
|
@ -72,21 +74,21 @@ class MainWindow: public wxFrame
|
|||
void GetIndexLoadPoem(void);
|
||||
void Resize(void);
|
||||
|
||||
DECLARE_EVENT_TABLE()
|
||||
DECLARE_EVENT_TABLE()
|
||||
};
|
||||
|
||||
// Menu items
|
||||
#define POEM_NEXT 100
|
||||
#define POEM_PREVIOUS 101
|
||||
#define POEM_COPY 102
|
||||
#define POEM_SEARCH 103
|
||||
#define POEM_NEXT_MATCH 104
|
||||
#define POEM_ABOUT 105
|
||||
#define POEM_EXIT 106
|
||||
#define POEM_COMPILE 107
|
||||
#define POEM_HELP_CONTENTS 108
|
||||
#define POEM_BIGGER_TEXT 109
|
||||
#define POEM_SMALLER_TEXT 110
|
||||
#define POEM_MINIMIZE 111
|
||||
|
||||
|
||||
enum
|
||||
{
|
||||
POEM_NEXT = wxID_HIGHEST,
|
||||
POEM_PREVIOUS,
|
||||
POEM_COPY,
|
||||
POEM_SEARCH,
|
||||
POEM_NEXT_MATCH,
|
||||
POEM_ABOUT,
|
||||
POEM_EXIT,
|
||||
POEM_COMPILE,
|
||||
POEM_BIGGER_TEXT,
|
||||
POEM_SMALLER_TEXT,
|
||||
POEM_MINIMIZE
|
||||
};
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue