1. minor headers rearrangement: wxprec.h doesn't include setup.h directly
any more, btu defs.h does - and not in the very beginning, but a bit later 2. some unused and uncompileable OS2 thing removed from string.cpp git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3242 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -6,7 +6,7 @@
|
||||
// Created: 25/10/98
|
||||
// RCS-ID: $Id$
|
||||
// Copyright: (c)
|
||||
// Licence: wxWindows licence
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#include <wx/notebook.h>
|
||||
@@ -16,7 +16,7 @@ class MyApp: public wxApp
|
||||
{
|
||||
public:
|
||||
bool OnInit(void);
|
||||
void InitTabView(wxNotebook* notebook, wxWindow* window);
|
||||
void InitTabView(wxNotebook* notebook, wxPanel* window);
|
||||
|
||||
wxButton* m_okButton;
|
||||
wxButton* m_cancelButton;
|
||||
@@ -25,6 +25,8 @@ public:
|
||||
|
||||
DECLARE_APP(MyApp)
|
||||
|
||||
#if USE_TABBED_DIALOG
|
||||
|
||||
class MyDialog: public wxDialog
|
||||
{
|
||||
public:
|
||||
@@ -38,9 +40,11 @@ public:
|
||||
protected:
|
||||
wxNotebook* m_notebook;
|
||||
|
||||
DECLARE_EVENT_TABLE()
|
||||
DECLARE_EVENT_TABLE()
|
||||
};
|
||||
|
||||
#else // USE_TABBED_DIALOG
|
||||
|
||||
class MyFrame: public wxFrame
|
||||
{
|
||||
public:
|
||||
@@ -51,7 +55,6 @@ public:
|
||||
void OnCloseWindow(wxCloseEvent& event);
|
||||
void OnAddPage(wxCommandEvent& event);
|
||||
void OnDeletePage(wxCommandEvent& event);
|
||||
void OnSize(wxSizeEvent& event);
|
||||
void OnIdle(wxIdleEvent& event);
|
||||
|
||||
void Init();
|
||||
@@ -60,9 +63,11 @@ protected:
|
||||
wxNotebook* m_notebook;
|
||||
wxPanel* m_panel; // Panel containing notebook and OK/Cancel/Help
|
||||
|
||||
DECLARE_EVENT_TABLE()
|
||||
DECLARE_EVENT_TABLE()
|
||||
};
|
||||
|
||||
#endif // USE_TABBED_DIALOG
|
||||
|
||||
// File ids
|
||||
#define TEST_ABOUT 2
|
||||
|
||||
|
Reference in New Issue
Block a user