From c0392997c9ae7624382ee07a8eddc674c27e68c9 Mon Sep 17 00:00:00 2001 From: Robert Roebling Date: Thu, 9 Jul 1998 06:25:37 +0000 Subject: [PATCH] ThreadnoGui compiles now. A few more compilefixes. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@209 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/gtk/icon.h | 2 +- include/wx/gtk1/icon.h | 2 +- install/gtk/configure | 2 +- install/gtk/configure.in | 2 +- src/Makefile.in | 1 + src/common/utilscmn.cpp | 2 +- src/gtk/dc.cpp | 6 +++--- src/gtk/threadno.cpp | 23 ++++++++++++----------- src/gtk/utilsgtk.cpp | 7 +++++++ src/gtk1/dc.cpp | 6 +++--- src/gtk1/threadno.cpp | 23 ++++++++++++----------- src/gtk1/utilsgtk.cpp | 7 +++++++ 12 files changed, 50 insertions(+), 33 deletions(-) diff --git a/include/wx/gtk/icon.h b/include/wx/gtk/icon.h index 1f5907bb2a..7bcfd636c2 100644 --- a/include/wx/gtk/icon.h +++ b/include/wx/gtk/icon.h @@ -41,7 +41,7 @@ public: inline wxIcon(const wxIcon& icon) { Ref(icon); } inline wxIcon(const wxIcon* icon) { if (icon) Ref(*icon); } - wxIcon( char **bits, int width = -1, int height = -1 ) : + wxIcon( char **bits, int WXUNUSED(width), int WXUNUSED(height) ) : wxBitmap( bits ) {}; inline wxIcon& operator = (const wxIcon& icon) { if (*this == icon) return (*this); Ref(icon); return *this; } diff --git a/include/wx/gtk1/icon.h b/include/wx/gtk1/icon.h index 1f5907bb2a..7bcfd636c2 100644 --- a/include/wx/gtk1/icon.h +++ b/include/wx/gtk1/icon.h @@ -41,7 +41,7 @@ public: inline wxIcon(const wxIcon& icon) { Ref(icon); } inline wxIcon(const wxIcon* icon) { if (icon) Ref(*icon); } - wxIcon( char **bits, int width = -1, int height = -1 ) : + wxIcon( char **bits, int WXUNUSED(width), int WXUNUSED(height) ) : wxBitmap( bits ) {}; inline wxIcon& operator = (const wxIcon& icon) { if (*this == icon) return (*this); Ref(icon); return *this; } diff --git a/install/gtk/configure b/install/gtk/configure index cf9fee4bd3..b0bba242d0 100755 --- a/install/gtk/configure +++ b/install/gtk/configure @@ -18,7 +18,7 @@ ac_help="$ac_help ac_help="$ac_help **--with-shared create shared libraries" ac_help="$ac_help -**--without-optimise create unoptimised code" +**--with-optimise create optimised code" ac_help="$ac_help **--with-debug_flag create code with DEBUG define set to 1" ac_help="$ac_help diff --git a/install/gtk/configure.in b/install/gtk/configure.in index 588929a3cb..e8fc33b1f6 100644 --- a/install/gtk/configure.in +++ b/install/gtk/configure.in @@ -741,7 +741,7 @@ AC_OVERRIDES(shared,shared, USE_SHARED) AC_OVERRIDES(optimise,optimise, -**--without-optimise create unoptimised code, +**--with-optimise create optimised code, USE_OPTIMISE) AC_OVERRIDES(debug_flag,debug_flag, diff --git a/src/Makefile.in b/src/Makefile.in index c8d2ce3619..51ee9ca103 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -65,6 +65,7 @@ LIB_CPP_SRC=\ gtk/choice.cpp \ gtk/colour.cpp \ gtk/control.cpp \ + gtk/combobox.cpp \ gtk/cursor.cpp \ gtk/data.cpp \ gtk/dc.cpp \ diff --git a/src/common/utilscmn.cpp b/src/common/utilscmn.cpp index 196f506ae7..349d6f04a0 100644 --- a/src/common/utilscmn.cpp +++ b/src/common/utilscmn.cpp @@ -10,7 +10,7 @@ ///////////////////////////////////////////////////////////////////////////// #ifdef __GNUG__ -#pragma implementation "utilscmn.h" +#pragma implementation "utils.h" #endif // For compilers that support precompilation, includes "wx.h". diff --git a/src/gtk/dc.cpp b/src/gtk/dc.cpp index 9637082010..b50ade747a 100644 --- a/src/gtk/dc.cpp +++ b/src/gtk/dc.cpp @@ -137,9 +137,9 @@ void wxDC::DrawSpline( long x1, long y1, long x2, long y2, long x3, long y3 ) { wxList list; list.DeleteContents(TRUE); - list.Append( new wxPoint(x1, y1) ); - list.Append( new wxPoint(x2, y2) ); - list.Append( new wxPoint(x3, y3) ); + list.Append( (wxObject*)new wxPoint(x1, y1) ); + list.Append( (wxObject*)new wxPoint(x2, y2) ); + list.Append( (wxObject*)new wxPoint(x3, y3) ); DrawSpline(&list); }; diff --git a/src/gtk/threadno.cpp b/src/gtk/threadno.cpp index deccf57775..2cdfcd3a37 100644 --- a/src/gtk/threadno.cpp +++ b/src/gtk/threadno.cpp @@ -13,6 +13,7 @@ #endif #include "wx/wx.h" +#include "wx/module.h" #include "wx/thread.h" wxMutex::wxMutex() @@ -26,13 +27,13 @@ wxMutex::~wxMutex() wxDebugMsg("wxMutex warning: destroying a locked mutex (%d locks)\n", m_locked); } -MutexError wxMutex::Lock() +wxMutexError wxMutex::Lock() { m_locked++; return MUTEX_NO_ERROR; } -MutexError wxMutex::TryLock() +wxMutexError wxMutex::TryLock() { if (m_locked > 0) return MUTEX_BUSY; @@ -40,7 +41,7 @@ MutexError wxMutex::TryLock() return MUTEX_NO_ERROR; } -MutexError wxMutex::Unlock() +wxMutexError wxMutex::Unlock() { if (m_locked == 0) return MUTEX_UNLOCKED; @@ -74,24 +75,24 @@ void wxCondition::Broadcast() { } -struct wxThreadPrivate { +struct wxThreadInternal { int thread_id; void* exit_status; }; -ThreadError wxThread::Create() +wxThreadError wxThread::Create() { p_internal->exit_status = Entry(); OnExit(); return THREAD_NO_ERROR; } -ThreadError wxThread::Destroy() +wxThreadError wxThread::Destroy() { return THREAD_RUNNING; } -void wxThread::DeferDestroy() +void wxThread::DeferDestroy( bool WXUNUSED(on) ) { } @@ -120,18 +121,18 @@ bool wxThread::IsAlive() const } void wxThread::SetPriority(int WXUNUSED(prio)) { } -int wxThread::GetPriority() const { } +int wxThread::GetPriority() const { return 0; } wxMutex wxMainMutex; // controls access to all GUI functions wxThread::wxThread() { - p_internal = new wxThreadPrivate(); + p_internal = new wxThreadInternal(); } wxThread::~wxThread() { - Cancel(); + Destroy(); Join(); delete p_internal; } @@ -156,7 +157,7 @@ bool wxThreadModule::OnInit() { return TRUE; } -void wxThreadModule::wxThreadExit() +void wxThreadModule::OnExit() { wxMainMutex.Unlock(); } diff --git a/src/gtk/utilsgtk.cpp b/src/gtk/utilsgtk.cpp index dedecb696e..d0d75b07a9 100644 --- a/src/gtk/utilsgtk.cpp +++ b/src/gtk/utilsgtk.cpp @@ -51,6 +51,12 @@ int wxKill(long pid, int sig) return kill(pid, sig); }; +void wxDisplaySize( int *width, int *height ) +{ + if (width) *width = gdk_screen_width(); + if (height) *height = gdk_screen_height(); +} + //------------------------------------------------------------------------ // user and home routines //------------------------------------------------------------------------ @@ -441,3 +447,4 @@ long wxExecute( const wxString& command, bool sync, wxProcess *process ) return wxExecute(argv, sync, process); }; + diff --git a/src/gtk1/dc.cpp b/src/gtk1/dc.cpp index 9637082010..b50ade747a 100644 --- a/src/gtk1/dc.cpp +++ b/src/gtk1/dc.cpp @@ -137,9 +137,9 @@ void wxDC::DrawSpline( long x1, long y1, long x2, long y2, long x3, long y3 ) { wxList list; list.DeleteContents(TRUE); - list.Append( new wxPoint(x1, y1) ); - list.Append( new wxPoint(x2, y2) ); - list.Append( new wxPoint(x3, y3) ); + list.Append( (wxObject*)new wxPoint(x1, y1) ); + list.Append( (wxObject*)new wxPoint(x2, y2) ); + list.Append( (wxObject*)new wxPoint(x3, y3) ); DrawSpline(&list); }; diff --git a/src/gtk1/threadno.cpp b/src/gtk1/threadno.cpp index deccf57775..2cdfcd3a37 100644 --- a/src/gtk1/threadno.cpp +++ b/src/gtk1/threadno.cpp @@ -13,6 +13,7 @@ #endif #include "wx/wx.h" +#include "wx/module.h" #include "wx/thread.h" wxMutex::wxMutex() @@ -26,13 +27,13 @@ wxMutex::~wxMutex() wxDebugMsg("wxMutex warning: destroying a locked mutex (%d locks)\n", m_locked); } -MutexError wxMutex::Lock() +wxMutexError wxMutex::Lock() { m_locked++; return MUTEX_NO_ERROR; } -MutexError wxMutex::TryLock() +wxMutexError wxMutex::TryLock() { if (m_locked > 0) return MUTEX_BUSY; @@ -40,7 +41,7 @@ MutexError wxMutex::TryLock() return MUTEX_NO_ERROR; } -MutexError wxMutex::Unlock() +wxMutexError wxMutex::Unlock() { if (m_locked == 0) return MUTEX_UNLOCKED; @@ -74,24 +75,24 @@ void wxCondition::Broadcast() { } -struct wxThreadPrivate { +struct wxThreadInternal { int thread_id; void* exit_status; }; -ThreadError wxThread::Create() +wxThreadError wxThread::Create() { p_internal->exit_status = Entry(); OnExit(); return THREAD_NO_ERROR; } -ThreadError wxThread::Destroy() +wxThreadError wxThread::Destroy() { return THREAD_RUNNING; } -void wxThread::DeferDestroy() +void wxThread::DeferDestroy( bool WXUNUSED(on) ) { } @@ -120,18 +121,18 @@ bool wxThread::IsAlive() const } void wxThread::SetPriority(int WXUNUSED(prio)) { } -int wxThread::GetPriority() const { } +int wxThread::GetPriority() const { return 0; } wxMutex wxMainMutex; // controls access to all GUI functions wxThread::wxThread() { - p_internal = new wxThreadPrivate(); + p_internal = new wxThreadInternal(); } wxThread::~wxThread() { - Cancel(); + Destroy(); Join(); delete p_internal; } @@ -156,7 +157,7 @@ bool wxThreadModule::OnInit() { return TRUE; } -void wxThreadModule::wxThreadExit() +void wxThreadModule::OnExit() { wxMainMutex.Unlock(); } diff --git a/src/gtk1/utilsgtk.cpp b/src/gtk1/utilsgtk.cpp index dedecb696e..d0d75b07a9 100644 --- a/src/gtk1/utilsgtk.cpp +++ b/src/gtk1/utilsgtk.cpp @@ -51,6 +51,12 @@ int wxKill(long pid, int sig) return kill(pid, sig); }; +void wxDisplaySize( int *width, int *height ) +{ + if (width) *width = gdk_screen_width(); + if (height) *height = gdk_screen_height(); +} + //------------------------------------------------------------------------ // user and home routines //------------------------------------------------------------------------ @@ -441,3 +447,4 @@ long wxExecute( const wxString& command, bool sync, wxProcess *process ) return wxExecute(argv, sync, process); }; + -- 2.47.2