ThreadnoGui compiles now.

A few more compilefixes.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@209 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/gtk/icon.h b/include/wx/gtk/icon.h
index 1f5907bb2ab087ff1da09945a3878a62fc0308ea..7bcfd636c209f3d12dee90677d390acb97665a18 100644 (file)
--- 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 1f5907bb2ab087ff1da09945a3878a62fc0308ea..7bcfd636c209f3d12dee90677d390acb97665a18 100644 (file)
--- 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 cf9fee4bd3f20358208efc85b2f57d6020acfd8c..b0bba242d060c64c7ef23ec8b0e0ef8b2b6a2160 100755 (executable)
--- 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 588929a3cb06ada0bac6c707ee0b406aaa423858..e8fc33b1f69653c25448139a9099d2c6b36aba09 100644 (file)
--- 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 c8d2ce3619c7050176cb9bf6311260ae8ac43049..51ee9ca103ba773566cf1d084669bde5989103fe 100644 (file)
--- 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 196f506ae727910acf8f3dc14a3fdb5e51791973..349d6f04a0755b47f164a4e6b9c80324b2d326ee 100644 (file)
--- 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 96370820106f69ffbb6b2b37957ecdf3ef366116..b50ade747a938b27d2eb14055abdda594e191795 100644 (file)
--- 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 deccf57775bc06b0cae7b67ccaa1ecd1a18b172a..2cdfcd3a371781d08b1af5c172ac7ac825a69199 100644 (file)
--- 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 dedecb696e3b91cce1e7de0f13fd05f8495766f6..d0d75b07a93e227a4cd232333f40194918f76554 100644 (file)
--- 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 96370820106f69ffbb6b2b37957ecdf3ef366116..b50ade747a938b27d2eb14055abdda594e191795 100644 (file)
--- 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 deccf57775bc06b0cae7b67ccaa1ecd1a18b172a..2cdfcd3a371781d08b1af5c172ac7ac825a69199 100644 (file)
--- 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 dedecb696e3b91cce1e7de0f13fd05f8495766f6..d0d75b07a93e227a4cd232333f40194918f76554 100644 (file)
--- 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);
 };
 
+