1. fixed wxGTK notebook which was completely broken by the merge
2. added a new file for commno notebook code (nbkbase.cpp) 3. removed 'include "wx/wx.h"' from html files as I got tired of recompiling them git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10793 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -21,12 +21,20 @@
|
||||
#pragma hdrstop
|
||||
#endif
|
||||
|
||||
#include "wx/defs.h"
|
||||
|
||||
#if wxUSE_HTML && wxUSE_STREAMS
|
||||
|
||||
#ifndef WXPRECOMP
|
||||
#include "wx/wx.h"
|
||||
#endif
|
||||
#include "wx/intl.h"
|
||||
#include "wx/log.h"
|
||||
|
||||
#include "wx/object.h"
|
||||
#include "wx/layout.h"
|
||||
#include "wx/sizer.h"
|
||||
|
||||
#include "wx/bmpbuttn.h"
|
||||
#include "wx/statbox.h"
|
||||
#include "wx/radiobox.h"
|
||||
#endif // WXPRECOMP
|
||||
|
||||
#include "wx/html/helpfrm.h"
|
||||
#include "wx/html/helpctrl.h"
|
||||
|
Reference in New Issue
Block a user