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

compilation fix for wxGTK

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21345 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2003-06-24 01:31:22 +00:00
parent 153ecbb81c
commit 46446cc2aa
10 changed files with 24 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/apptrait.h
View File

@@ -89,7 +89,9 @@ public:
#if defined(__WXMSW__) #if defined(__WXMSW__)
#include "wx/msw/apptbase.h" #include "wx/msw/apptbase.h"
#else #elif defined(__UNIX__)
#include "wx/unix/apptbase.h"
#else // no platform-specific methods to add to wxAppTraits
typedef typedef
// wxAppTraits must be a class because it was forward declared as class // wxAppTraits must be a class because it was forward declared as class
class WXDLLEXPORT wxAppTraits : public wxAppTraitsBase class WXDLLEXPORT wxAppTraits : public wxAppTraitsBase

2
include/wx/unix/apptrait.h
View File

@@ -19,7 +19,7 @@
class WXDLLEXPORT wxConsoleAppTraits : public wxConsoleAppTraitsBase class WXDLLEXPORT wxConsoleAppTraits : public wxConsoleAppTraitsBase
{ {
public: public:
virtual bool CreateEndProcessPipe(); virtual bool CreateEndProcessPipe(wxExecuteData& execData);
virtual bool IsWriteFDOfEndProcessPipe(wxExecuteData& execData, int fd); virtual bool IsWriteFDOfEndProcessPipe(wxExecuteData& execData, int fd);
virtual void DetachWriteFDOfEndProcessPipe(wxExecuteData& execData); virtual void DetachWriteFDOfEndProcessPipe(wxExecuteData& execData);
virtual int WaitForChild(wxExecuteData& execData); virtual int WaitForChild(wxExecuteData& execData);

1
src/common/appcmn.cpp
View File

@@ -32,6 +32,7 @@
#include "wx/app.h" #include "wx/app.h"
#include "wx/intl.h" #include "wx/intl.h"
#include "wx/list.h" #include "wx/list.h"
#include "wx/log.h"
#include "wx/msgdlg.h" #include "wx/msgdlg.h"
#endif #endif

3
src/common/msgout.cpp
View File

@@ -121,7 +121,8 @@ void wxMessageOutputDebug::Printf(const wxChar* format, ...)
#endif #endif
} }
#else // !MSW, !Mac #else // !MSW, !Mac
wxFputs(out, stderr); // FIXME: why is wxFputs() not defined under Linux?
fputs(out.mb_str(), stderr);
fflush(stderr); fflush(stderr);
#endif // platform #endif // platform
} }

1
src/common/timercmn.cpp
View File

@@ -32,6 +32,7 @@
#if wxUSE_TIMER #if wxUSE_TIMER
#ifndef WX_PRECOMP #ifndef WX_PRECOMP
#include "wx/timer.h"
#endif #endif
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------

3
src/gtk/app.cpp
View File

@@ -76,9 +76,6 @@
// global data // global data
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
wxApp *wxTheApp = (wxApp *) NULL;
wxAppInitializerFunction wxAppBase::m_appInitFn = (wxAppInitializerFunction) NULL;
bool g_mainThreadLocked = FALSE; bool g_mainThreadLocked = FALSE;
gint g_pendingTag = 0; gint g_pendingTag = 0;

11
src/gtk/utilsgtk.cpp
View File

@@ -10,6 +10,7 @@
#include "wx/utils.h" #include "wx/utils.h"
#include "wx/string.h" #include "wx/string.h"
#include "wx/apptrait.h"
#include "wx/intl.h" #include "wx/intl.h"
#include "wx/log.h" #include "wx/log.h"
@@ -121,12 +122,14 @@ int wxDisplayDepth()
return gdk_window_get_visual( wxGetRootWindow()->window )->depth; return gdk_window_get_visual( wxGetRootWindow()->window )->depth;
} }
int wxGetOsVersion(int *majorVsn, int *minorVsn) int wxGUIAppTraits::GetOSVersion(int *majorVsn, int *minorVsn)
{ {
if (majorVsn) *majorVsn = GTK_MAJOR_VERSION; if (majorVsn)
if (minorVsn) *minorVsn = GTK_MINOR_VERSION; *majorVsn = GTK_MAJOR_VERSION;
if (minorVsn)
*minorVsn = GTK_MINOR_VERSION;
return wxGTK; return wxGTK;
} }
wxWindow* wxFindWindowAtPoint(const wxPoint& pt) wxWindow* wxFindWindowAtPoint(const wxPoint& pt)

3
src/gtk1/app.cpp
View File

@@ -76,9 +76,6 @@
// global data // global data
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
wxApp *wxTheApp = (wxApp *) NULL;
wxAppInitializerFunction wxAppBase::m_appInitFn = (wxAppInitializerFunction) NULL;
bool g_mainThreadLocked = FALSE; bool g_mainThreadLocked = FALSE;
gint g_pendingTag = 0; gint g_pendingTag = 0;

11
src/gtk1/utilsgtk.cpp
View File

@@ -10,6 +10,7 @@
#include "wx/utils.h" #include "wx/utils.h"
#include "wx/string.h" #include "wx/string.h"
#include "wx/apptrait.h"
#include "wx/intl.h" #include "wx/intl.h"
#include "wx/log.h" #include "wx/log.h"
@@ -121,12 +122,14 @@ int wxDisplayDepth()
return gdk_window_get_visual( wxGetRootWindow()->window )->depth; return gdk_window_get_visual( wxGetRootWindow()->window )->depth;
} }
int wxGetOsVersion(int *majorVsn, int *minorVsn) int wxGUIAppTraits::GetOSVersion(int *majorVsn, int *minorVsn)
{ {
if (majorVsn) *majorVsn = GTK_MAJOR_VERSION; if (majorVsn)
if (minorVsn) *minorVsn = GTK_MINOR_VERSION; *majorVsn = GTK_MAJOR_VERSION;
if (minorVsn)
*minorVsn = GTK_MINOR_VERSION;
return wxGTK; return wxGTK;
} }
wxWindow* wxFindWindowAtPoint(const wxPoint& pt) wxWindow* wxFindWindowAtPoint(const wxPoint& pt)

3
src/unix/utilsunx.cpp
View File

@@ -21,6 +21,7 @@
#include "wx/intl.h" #include "wx/intl.h"
#include "wx/log.h" #include "wx/log.h"
#include "wx/app.h" #include "wx/app.h"
#include "wx/apptrait.h"
#include "wx/utils.h" #include "wx/utils.h"
#include "wx/process.h" #include "wx/process.h"
@@ -1079,7 +1080,7 @@ bool wxGUIAppTraits::CreateEndProcessPipe(wxExecuteData& execData)
bool wxGUIAppTraits::IsWriteFDOfEndProcessPipe(wxExecuteData& execData, int fd) bool wxGUIAppTraits::IsWriteFDOfEndProcessPipe(wxExecuteData& execData, int fd)
{ {
return fd == execData.pipeEndProcDetect[wxPipe::Write] return fd == (execData.pipeEndProcDetect)[wxPipe::Write];
} }
void wxGUIAppTraits::DetachWriteFDOfEndProcessPipe(wxExecuteData& execData) void wxGUIAppTraits::DetachWriteFDOfEndProcessPipe(wxExecuteData& execData)