MSW compilation (and other) fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3829 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -37,6 +37,7 @@ class WXDLLEXPORT wxList;
|
||||
class WXDLLEXPORT wxClientData;
|
||||
class WXDLLEXPORT wxDC;
|
||||
class WXDLLEXPORT wxMenu;
|
||||
class WXDLLEXPORT wxWindow;
|
||||
#endif // wxUSE_GUI
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
|
@@ -12,13 +12,12 @@
|
||||
#ifndef _WX_SETUP_H_
|
||||
#define _WX_SETUP_H_
|
||||
|
||||
/*
|
||||
* General features
|
||||
*
|
||||
*/
|
||||
// ----------------------------------------------------------------------------
|
||||
// global settings
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
#define wxUSE_CONFIG 1
|
||||
// Use wxConfig, with CreateConfig in wxApp
|
||||
// define this to 0 when building wxBase library
|
||||
#define wxUSE_GUI 1
|
||||
|
||||
#define WXWIN_COMPATIBILITY 0
|
||||
// Compatibility with 1.68 API.
|
||||
@@ -27,6 +26,13 @@
|
||||
// the compatibility code is now very minimal so there
|
||||
// is little advantage to setting it to 1.
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// General features
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
#define wxUSE_CONFIG 1
|
||||
// Use wxConfig, with CreateConfig in wxApp
|
||||
|
||||
#define wxUSE_POSTSCRIPT 0
|
||||
// 0 for no PostScript device context
|
||||
#define wxUSE_AFM_FOR_POSTSCRIPT 0
|
||||
|
@@ -6,7 +6,7 @@
|
||||
// Created: 01/02/97
|
||||
// RCS-ID: $Id$
|
||||
// Copyright: (c) Julian Smart
|
||||
// Licence: wxWindows licence
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#ifndef _WX_TIMER_H_
|
||||
@@ -37,9 +37,9 @@ public:
|
||||
bool OneShot() const { return oneShot; }
|
||||
|
||||
protected:
|
||||
bool oneShot ;
|
||||
int milli ;
|
||||
int lastMilli ;
|
||||
bool oneShot;
|
||||
int milli;
|
||||
int lastMilli;
|
||||
|
||||
long id;
|
||||
|
||||
|
@@ -47,6 +47,9 @@
|
||||
# define HAVE_WCSLEN 1
|
||||
|
||||
# include <tchar.h>
|
||||
|
||||
# define T(x) _T(x)
|
||||
|
||||
# if wxUSE_UNICODE // temporary - preserve binary compatibility
|
||||
typedef _TCHAR wxChar;
|
||||
typedef _TSCHAR wxSChar;
|
||||
|
Reference in New Issue
Block a user