Fixes for WinCE
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23199 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -1,5 +1,5 @@
|
|||||||
[OPTIONS]
|
[OPTIONS]
|
||||||
BMROOT=c:\wx2dev\wxWindows\docs/latex/wx ; Assume that bitmaps are where the source is
|
BMROOT=c:\wx2dev\wxWind~1\docs/latex/wx ; Assume that bitmaps are where the source is
|
||||||
TITLE=wxWindows Manual
|
TITLE=wxWindows Manual
|
||||||
CONTENTS=Contents
|
CONTENTS=Contents
|
||||||
COMPRESS=HIGH
|
COMPRESS=HIGH
|
||||||
|
@@ -604,11 +604,17 @@ public:
|
|||||||
// we need HINSTANCE declaration to define WinMain()
|
// we need HINSTANCE declaration to define WinMain()
|
||||||
#include "wx/msw/wrapwin.h"
|
#include "wx/msw/wrapwin.h"
|
||||||
|
|
||||||
|
#ifdef SW_SHOWNORMAL
|
||||||
|
#define wxSW_SHOWNORMAL SW_SHOWNORMAL
|
||||||
|
#else
|
||||||
|
#define wxSW_SHOWNORMAL 0
|
||||||
|
#endif
|
||||||
|
|
||||||
#define IMPLEMENT_WXWIN_MAIN \
|
#define IMPLEMENT_WXWIN_MAIN \
|
||||||
extern int wxEntry(HINSTANCE hInstance, \
|
extern int wxEntry(HINSTANCE hInstance, \
|
||||||
HINSTANCE hPrevInstance = NULL, \
|
HINSTANCE hPrevInstance = NULL, \
|
||||||
char *pCmdLine = NULL, \
|
char *pCmdLine = NULL, \
|
||||||
int nCmdShow = SW_NORMAL); \
|
int nCmdShow = wxSW_SHOWNORMAL); \
|
||||||
extern "C" int WINAPI WinMain(HINSTANCE hInstance, \
|
extern "C" int WINAPI WinMain(HINSTANCE hInstance, \
|
||||||
HINSTANCE hPrevInstance, \
|
HINSTANCE hPrevInstance, \
|
||||||
char *lpCmdLine, \
|
char *lpCmdLine, \
|
||||||
|
@@ -55,7 +55,9 @@ enum
|
|||||||
#if wxUSE_TOOLBAR
|
#if wxUSE_TOOLBAR
|
||||||
#include "wx/tbarbase.h" // the base class for all toolbars
|
#include "wx/tbarbase.h" // the base class for all toolbars
|
||||||
|
|
||||||
#if !wxUSE_TOOLBAR_NATIVE && !defined(__WXUNIVERSAL__)
|
// Simple toolbar no longer available, so we will need to have
|
||||||
|
// a generic toolbar at some point (perhaps the wxUniv toolbar)
|
||||||
|
#if 0 // !wxUSE_TOOLBAR_NATIVE && !defined(__WXUNIVERSAL__)
|
||||||
#include "wx/tbarsmpl.h"
|
#include "wx/tbarsmpl.h"
|
||||||
|
|
||||||
class WXDLLEXPORT wxToolBar : public wxToolBarSimple
|
class WXDLLEXPORT wxToolBar : public wxToolBarSimple
|
||||||
|
Reference in New Issue
Block a user