Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Various fixes for X11 compilation

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14054 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2002-02-07 15:40:02 +00:00
parent 45ce82f320
commit f79bd02d8e
5 changed files with 1532 additions and 769 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2288
configure vendored
View File

File diff suppressed because it is too large Load Diff

2
configure.in
View File

@@ -1090,7 +1090,7 @@ if test "$wxUSE_GUI" = "yes"; then
dnl we suppose that expr is available (maybe there is a better way to do dnl we suppose that expr is available (maybe there is a better way to do
dnl this? what about using ALL_TOOLKITS? TODO) dnl this? what about using ALL_TOOLKITS? TODO)
NUM_TOOLKITS=`expr ${wxUSE_GTK:-0} + ${wxUSE_MOTIF:-0} + ${wxUSE_MAC:-0} \ NUM_TOOLKITS=`expr ${wxUSE_GTK:-0} + ${wxUSE_MOTIF:-0} + ${wxUSE_MAC:-0} \
+ ${wxUSE_WINE:-0} + ${wxUSE_MSW:-0} + ${wxUSE_MGL:-0} + ${wxUSE_MICROWIN:-0}+ ${wxUSE_X11:-0}` + ${wxUSE_WINE:-0} + ${wxUSE_MSW:-0} + ${wxUSE_MGL:-0} + ${wxUSE_MICROWIN:-0} + ${wxUSE_X11:-0}`
dnl Allow wxUSE_PM only for OS/2 with EMX. dnl Allow wxUSE_PM only for OS/2 with EMX.
dnl Path separator; ':' for unix. dnl Path separator; ':' for unix.

2
include/wx/platform.h
View File

@@ -217,7 +217,7 @@
#endif /* __WXMOTIF__ */ #endif /* __WXMOTIF__ */
#endif #endif
#if defined(__WXMOTIF__) #if defined(__WXMOTIF__) || defined(__WXX11__)
#define __X__ #define __X__
#endif #endif

5
include/wx/univ/checkbox.h
View File

@@ -32,6 +32,11 @@
// wxCheckBox // wxCheckBox
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// X11 headers may define this
#ifdef Status
#undef Status
#endif
class WXDLLEXPORT wxCheckBox : public wxCheckBoxBase class WXDLLEXPORT wxCheckBox : public wxCheckBoxBase
{ {
public: public:

4
include/wx/x11/window.h
View File

@@ -41,7 +41,7 @@ public:
Create(parent, id, pos, size, style, name); Create(parent, id, pos, size, style, name);
} }
virtual ~wxWindow(); virtual ~wxWindowX11();
bool Create(wxWindow *parent, bool Create(wxWindow *parent,
wxWindowID id, wxWindowID id,
@@ -194,7 +194,7 @@ protected:
void CanvasSetClientSize(int width, int size); void CanvasSetClientSize(int width, int size);
void CanvasSetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO); void CanvasSetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
void SetMainWindow(WXWindow w) { m_mainWindow = w; } void SetMainWindow(WXWindow w) { m_mainWidget = w; }
bool CanAddEventHandler() const { return m_canAddEventHandler; } bool CanAddEventHandler() const { return m_canAddEventHandler; }
void SetCanAddEventHandler(bool flag) { m_canAddEventHandler = flag; } void SetCanAddEventHandler(bool flag) { m_canAddEventHandler = flag; }