Do not #include an header where a forward declaration suffixes. Do not
include wx/wx.h directly. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19091 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
ff7d1dcb82
commit
00dd3b1897
@ -16,9 +16,11 @@
|
||||
#endif
|
||||
|
||||
#include "wx/defs.h"
|
||||
#include "wx/gdicmn.h"
|
||||
#include "wx/bitmap.h"
|
||||
#include "wx/dc.h"
|
||||
#include "wx/list.h"
|
||||
|
||||
class WXDLLEXPORT wxDC;
|
||||
class WXDLLEXPORT wxBitmap;
|
||||
class WXDLLEXPORT wxColour;
|
||||
|
||||
/*
|
||||
* wxImageList is used for wxListCtrl, wxTreeCtrl. These controls refer to
|
||||
|
@ -18,10 +18,8 @@
|
||||
// ----------------------------------------------------------------------------
|
||||
// headers
|
||||
// ----------------------------------------------------------------------------
|
||||
#include "wx/dynarray.h"
|
||||
#include "wx/event.h"
|
||||
#include "wx/control.h"
|
||||
#include "wx/generic/tabg.h"
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// types
|
||||
@ -30,30 +28,12 @@
|
||||
// fwd declarations
|
||||
class WXDLLEXPORT wxImageList;
|
||||
class WXDLLEXPORT wxWindow;
|
||||
class WXDLLEXPORT wxTabView;
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// wxNotebook
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
class WXDLLEXPORT wxNotebook;
|
||||
|
||||
// This reuses wxTabView to draw the tabs.
|
||||
class WXDLLEXPORT wxNotebookTabView: public wxTabView
|
||||
{
|
||||
DECLARE_DYNAMIC_CLASS(wxNotebookTabView)
|
||||
public:
|
||||
wxNotebookTabView(wxNotebook* notebook, long style = wxTAB_STYLE_DRAW_BOX | wxTAB_STYLE_COLOUR_INTERIOR);
|
||||
~wxNotebookTabView(void);
|
||||
|
||||
// Called when a tab is activated
|
||||
virtual void OnTabActivate(int activateId, int deactivateId);
|
||||
// Allows vetoing
|
||||
virtual bool OnTabPreActivate(int activateId, int deactivateId);
|
||||
|
||||
protected:
|
||||
wxNotebook* m_notebook;
|
||||
};
|
||||
|
||||
class wxNotebook : public wxNotebookBase
|
||||
{
|
||||
public:
|
||||
|
@ -17,6 +17,7 @@
|
||||
#endif
|
||||
|
||||
#include "wx/button.h"
|
||||
#include "wx/bitmap.h"
|
||||
|
||||
WXDLLEXPORT_DATA(extern const char*) wxButtonNameStr;
|
||||
|
||||
|
@ -17,7 +17,6 @@
|
||||
#endif
|
||||
|
||||
#include "wx/control.h"
|
||||
#include "wx/gdicmn.h"
|
||||
|
||||
WXDLLEXPORT_DATA(extern const char*) wxButtonNameStr;
|
||||
|
||||
|
@ -17,11 +17,7 @@
|
||||
#endif
|
||||
|
||||
#include "wx/bitmap.h"
|
||||
#if wxUSE_IMAGE
|
||||
#include "wx/image.h"
|
||||
#endif
|
||||
|
||||
|
||||
#include "wx/list.h"
|
||||
|
||||
/* Cursor for one display, so we can choose the correct one for
|
||||
* the current display.
|
||||
|
@ -19,6 +19,9 @@
|
||||
#if wxUSE_PROPSHEET
|
||||
|
||||
#include "wx/prop.h"
|
||||
#include "wx/panel.h"
|
||||
|
||||
class WXDLLEXPORT wxPropertyFormView;
|
||||
|
||||
////
|
||||
//// Property form classes: for using an existing dialog or panel
|
||||
|
@ -21,7 +21,6 @@
|
||||
|
||||
#if defined(__WXMGL__) || defined(__WXMAC__) || defined(__WXMOTIF__)
|
||||
|
||||
#include "wx/wx.h"
|
||||
#include "wx/setup.h"
|
||||
#include "wx/utils.h"
|
||||
#include "wx/palette.h"
|
||||
|
@ -21,6 +21,7 @@
|
||||
#include "wx/generic/imaglist.h"
|
||||
#include "wx/icon.h"
|
||||
#include "wx/image.h"
|
||||
#include "wx/dc.h"
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// wxImageList
|
||||
|
@ -33,6 +33,7 @@
|
||||
#include "wx/generic/imaglist.h"
|
||||
#include "wx/notebook.h"
|
||||
#include "wx/dcclient.h"
|
||||
#include "wx/generic/tabg.h"
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// macros
|
||||
@ -65,6 +66,27 @@ IMPLEMENT_DYNAMIC_CLASS(wxNotebookEvent, wxCommandEvent)
|
||||
// implementation
|
||||
// ============================================================================
|
||||
|
||||
// ============================================================================
|
||||
// Private class
|
||||
// ============================================================================
|
||||
|
||||
// This reuses wxTabView to draw the tabs.
|
||||
class WXDLLEXPORT wxNotebookTabView: public wxTabView
|
||||
{
|
||||
DECLARE_DYNAMIC_CLASS(wxNotebookTabView)
|
||||
public:
|
||||
wxNotebookTabView(wxNotebook* notebook, long style = wxTAB_STYLE_DRAW_BOX | wxTAB_STYLE_COLOUR_INTERIOR);
|
||||
~wxNotebookTabView(void);
|
||||
|
||||
// Called when a tab is activated
|
||||
virtual void OnTabActivate(int activateId, int deactivateId);
|
||||
// Allows vetoing
|
||||
virtual bool OnTabPreActivate(int activateId, int deactivateId);
|
||||
|
||||
protected:
|
||||
wxNotebook* m_notebook;
|
||||
};
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// wxNotebook construction
|
||||
// ----------------------------------------------------------------------------
|
||||
|
@ -23,9 +23,12 @@
|
||||
#if wxUSE_PROPSHEET
|
||||
|
||||
#ifndef WX_PRECOMP
|
||||
#include "wx/choice.h"
|
||||
#include "wx/checkbox.h"
|
||||
#include "wx/slider.h"
|
||||
#include "wx/msgdlg.h"
|
||||
#endif
|
||||
|
||||
#include "wx/wx.h"
|
||||
#include "wx/propform.h"
|
||||
|
||||
#include <ctype.h>
|
||||
|
@ -23,7 +23,8 @@
|
||||
#if wxUSE_TAB_DIALOG
|
||||
|
||||
#ifndef WX_PRECOMP
|
||||
#include "wx/wx.h"
|
||||
#include "wx/settings.h"
|
||||
#include "wx/intl.h"
|
||||
#endif
|
||||
|
||||
#include <stdio.h>
|
||||
|
@ -18,6 +18,7 @@
|
||||
#define XtWindow XTWINDOW
|
||||
#endif
|
||||
|
||||
#include "wx/tab.h"
|
||||
#include "wx/mdi.h"
|
||||
#include "wx/menu.h"
|
||||
#include "wx/settings.h"
|
||||
|
@ -25,7 +25,7 @@
|
||||
#define XtDisplay XTDISPLAY
|
||||
#endif
|
||||
|
||||
#include "wx/wx.h"
|
||||
#include "wx/settings.h"
|
||||
#include "wx/app.h"
|
||||
#include "wx/timer.h"
|
||||
#include "wx/toolbar.h"
|
||||
|
Loading…
Reference in New Issue
Block a user