Added a few non-threads compile fixes,

  Removed strcasecmp defines from db.cpp and dbtable.cpp,
  Added more stand-alone makefiles,
  wxDropSource::DoDraDrop()'s return values works now
    (wxDragNone, -Copy, -Move).

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

diff --git a/Makefile.in b/Makefile.in
index 713df731203c101e503db663430e4b7f1a696c96..7fc44c38069429cf3e371b904ed308a8142c5248 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,5 +1,5 @@
 #
-# This file was automatically generated by tmake at 19:49, 1999/11/14
+# This file was automatically generated by tmake at 18:16, 1999/11/15
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE UNX.T!
 
 #
@@ -2290,47 +2290,54 @@ SAMPLES_DIST:
        cp $(SAMPDIR)/Makefile.in $(DISTDIR)/samples
        mkdir $(DISTDIR)/samples/bombs
        cp $(SAMPDIR)/bombs/Makefile.in $(DISTDIR)/samples/bombs
-       cp $(SAMPDIR)/bombs/Makefile $(DISTDIR)/samples/bombs
+       cp $(SAMPDIR)/bombs/makefile.unx $(DISTDIR)/samples/bombs
        cp $(SAMPDIR)/bombs/*.cpp $(DISTDIR)/samples/bombs
        cp $(SAMPDIR)/bombs/*.h $(DISTDIR)/samples/bombs
        cp $(SAMPDIR)/bombs/*.xpm $(DISTDIR)/samples/bombs
        cp $(SAMPDIR)/bombs/readme.txt $(DISTDIR)/samples/bombs
        mkdir $(DISTDIR)/samples/caret
        cp $(SAMPDIR)/caret/Makefile.in $(DISTDIR)/samples/caret
+       cp $(SAMPDIR)/caret/makefile.unx $(DISTDIR)/samples/caret
        cp $(SAMPDIR)/caret/*.cpp $(DISTDIR)/samples/caret
        cp $(SAMPDIR)/caret/*.xpm $(DISTDIR)/samples/caret
        mkdir $(DISTDIR)/samples/config
        cp $(SAMPDIR)/config/Makefile.in $(DISTDIR)/samples/config
+       cp $(SAMPDIR)/config/makefile.unx $(DISTDIR)/samples/config
        cp $(SAMPDIR)/config/*.cpp $(DISTDIR)/samples/config
        mkdir $(DISTDIR)/samples/controls
        mkdir $(DISTDIR)/samples/controls/icons
        cp $(SAMPDIR)/controls/Makefile.in $(DISTDIR)/samples/controls
-       cp $(SAMPDIR)/controls/Makefile $(DISTDIR)/samples/controls
+       cp $(SAMPDIR)/controls/makefile.unx $(DISTDIR)/samples/controls
        cp $(SAMPDIR)/controls/*.cpp $(DISTDIR)/samples/controls
        cp $(SAMPDIR)/controls/*.xpm $(DISTDIR)/samples/controls
        cp $(SAMPDIR)/controls/icons/*.??? $(DISTDIR)/samples/controls/icons
        mkdir $(DISTDIR)/samples/checklst
        cp $(SAMPDIR)/checklst/Makefile.in $(DISTDIR)/samples/checklst
+       cp $(SAMPDIR)/checklst/makefile.unx $(DISTDIR)/samples/checklst
        cp $(SAMPDIR)/checklst/*.cpp $(DISTDIR)/samples/checklst
        cp $(SAMPDIR)/checklst/*.xpm $(DISTDIR)/samples/checklst
        mkdir $(DISTDIR)/samples/printing
        cp $(SAMPDIR)/printing/Makefile.in $(DISTDIR)/samples/printing
+       cp $(SAMPDIR)/printing/makefile.unx $(DISTDIR)/samples/printing
        cp $(SAMPDIR)/printing/*.cpp $(DISTDIR)/samples/printing
        cp $(SAMPDIR)/printing/*.h $(DISTDIR)/samples/printing
        cp $(SAMPDIR)/printing/*.xpm $(DISTDIR)/samples/printing
        cp $(SAMPDIR)/printing/*.xbm $(DISTDIR)/samples/printing
        mkdir $(DISTDIR)/samples/db
        cp $(SAMPDIR)/db/Makefile.in $(DISTDIR)/samples/db
+       cp $(SAMPDIR)/db/makefile.unx $(DISTDIR)/samples/db
        cp $(SAMPDIR)/db/*.cpp $(DISTDIR)/samples/db
        cp $(SAMPDIR)/db/*.h $(DISTDIR)/samples/db
        cp $(SAMPDIR)/db/*.xpm $(DISTDIR)/samples/db
        mkdir $(DISTDIR)/samples/dialogs
        cp $(SAMPDIR)/dialogs/Makefile.in $(DISTDIR)/samples/dialogs
+       cp $(SAMPDIR)/dialogs/makefile.unx $(DISTDIR)/samples/dialogs
        cp $(SAMPDIR)/dialogs/*.cpp $(DISTDIR)/samples/dialogs
        cp $(SAMPDIR)/dialogs/*.h $(DISTDIR)/samples/dialogs
        cp $(SAMPDIR)/dialogs/*.txt $(DISTDIR)/samples/dialogs
        mkdir $(DISTDIR)/samples/dnd
        cp $(SAMPDIR)/dnd/Makefile.in $(DISTDIR)/samples/dnd
+       cp $(SAMPDIR)/dnd/makefile.unx $(DISTDIR)/samples/dnd
        cp $(SAMPDIR)/dnd/*.wxr $(DISTDIR)/samples/dnd
        cp $(SAMPDIR)/dnd/*.cpp $(DISTDIR)/samples/dnd
        cp $(SAMPDIR)/dnd/*.xpm $(DISTDIR)/samples/dnd

diff --git a/distrib/msw/tmake/unx.t b/distrib/msw/tmake/unx.t
index 49f4a19076c80ae9fd9ab4b0726a9a4c7a5c3863..f118850af5169fc46e9c11f3c414fa472577f678 100644 (file)
--- a/distrib/msw/tmake/unx.t
+++ b/distrib/msw/tmake/unx.t
@@ -780,47 +780,54 @@ SAMPLES_DIST:
        cp $(SAMPDIR)/Makefile.in $(DISTDIR)/samples
        mkdir $(DISTDIR)/samples/bombs
        cp $(SAMPDIR)/bombs/Makefile.in $(DISTDIR)/samples/bombs
-       cp $(SAMPDIR)/bombs/Makefile $(DISTDIR)/samples/bombs
+       cp $(SAMPDIR)/bombs/makefile.unx $(DISTDIR)/samples/bombs
        cp $(SAMPDIR)/bombs/*.cpp $(DISTDIR)/samples/bombs
        cp $(SAMPDIR)/bombs/*.h $(DISTDIR)/samples/bombs
        cp $(SAMPDIR)/bombs/*.xpm $(DISTDIR)/samples/bombs
        cp $(SAMPDIR)/bombs/readme.txt $(DISTDIR)/samples/bombs
        mkdir $(DISTDIR)/samples/caret
        cp $(SAMPDIR)/caret/Makefile.in $(DISTDIR)/samples/caret
+       cp $(SAMPDIR)/caret/makefile.unx $(DISTDIR)/samples/caret
        cp $(SAMPDIR)/caret/*.cpp $(DISTDIR)/samples/caret
        cp $(SAMPDIR)/caret/*.xpm $(DISTDIR)/samples/caret
        mkdir $(DISTDIR)/samples/config
        cp $(SAMPDIR)/config/Makefile.in $(DISTDIR)/samples/config
+       cp $(SAMPDIR)/config/makefile.unx $(DISTDIR)/samples/config
        cp $(SAMPDIR)/config/*.cpp $(DISTDIR)/samples/config
        mkdir $(DISTDIR)/samples/controls
        mkdir $(DISTDIR)/samples/controls/icons
        cp $(SAMPDIR)/controls/Makefile.in $(DISTDIR)/samples/controls
-       cp $(SAMPDIR)/controls/Makefile $(DISTDIR)/samples/controls
+       cp $(SAMPDIR)/controls/makefile.unx $(DISTDIR)/samples/controls
        cp $(SAMPDIR)/controls/*.cpp $(DISTDIR)/samples/controls
        cp $(SAMPDIR)/controls/*.xpm $(DISTDIR)/samples/controls
        cp $(SAMPDIR)/controls/icons/*.??? $(DISTDIR)/samples/controls/icons
        mkdir $(DISTDIR)/samples/checklst
        cp $(SAMPDIR)/checklst/Makefile.in $(DISTDIR)/samples/checklst
+       cp $(SAMPDIR)/checklst/makefile.unx $(DISTDIR)/samples/checklst
        cp $(SAMPDIR)/checklst/*.cpp $(DISTDIR)/samples/checklst
        cp $(SAMPDIR)/checklst/*.xpm $(DISTDIR)/samples/checklst
        mkdir $(DISTDIR)/samples/printing
        cp $(SAMPDIR)/printing/Makefile.in $(DISTDIR)/samples/printing
+       cp $(SAMPDIR)/printing/makefile.unx $(DISTDIR)/samples/printing
        cp $(SAMPDIR)/printing/*.cpp $(DISTDIR)/samples/printing
        cp $(SAMPDIR)/printing/*.h $(DISTDIR)/samples/printing
        cp $(SAMPDIR)/printing/*.xpm $(DISTDIR)/samples/printing
        cp $(SAMPDIR)/printing/*.xbm $(DISTDIR)/samples/printing
        mkdir $(DISTDIR)/samples/db
        cp $(SAMPDIR)/db/Makefile.in $(DISTDIR)/samples/db
+       cp $(SAMPDIR)/db/makefile.unx $(DISTDIR)/samples/db
        cp $(SAMPDIR)/db/*.cpp $(DISTDIR)/samples/db
        cp $(SAMPDIR)/db/*.h $(DISTDIR)/samples/db
        cp $(SAMPDIR)/db/*.xpm $(DISTDIR)/samples/db
        mkdir $(DISTDIR)/samples/dialogs
        cp $(SAMPDIR)/dialogs/Makefile.in $(DISTDIR)/samples/dialogs
+       cp $(SAMPDIR)/dialogs/makefile.unx $(DISTDIR)/samples/dialogs
        cp $(SAMPDIR)/dialogs/*.cpp $(DISTDIR)/samples/dialogs
        cp $(SAMPDIR)/dialogs/*.h $(DISTDIR)/samples/dialogs
        cp $(SAMPDIR)/dialogs/*.txt $(DISTDIR)/samples/dialogs
        mkdir $(DISTDIR)/samples/dnd
        cp $(SAMPDIR)/dnd/Makefile.in $(DISTDIR)/samples/dnd
+       cp $(SAMPDIR)/dnd/makefile.unx $(DISTDIR)/samples/dnd
        cp $(SAMPDIR)/dnd/*.wxr $(DISTDIR)/samples/dnd
        cp $(SAMPDIR)/dnd/*.cpp $(DISTDIR)/samples/dnd
        cp $(SAMPDIR)/dnd/*.xpm $(DISTDIR)/samples/dnd

diff --git a/samples/bombs/Makefile b/samples/bombs/Makefile
deleted file mode 100644 (file)
index 738e5f4..0000000
--- a/samples/bombs/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-#
-# File:                Makefile for samples
-# Author:      Robert Roebling
-# Created:     1999
-# Updated:     
-# Copyright:   (c) 1998 Robert Roebling
-#
-# This makefile requires a Unix version of wxWindows
-# to be installed on your system. This is most often
-# done typing "make install" when using the complete
-# sources of wxWindows or by installing the two
-# RPM packages wxGTK.XXX.rpm and wxGTK-devel.XXX.rpm
-# under Linux.
-#
-
-CC = gcc
-
-PROGRAM = bombs
-
-$(PROGRAM): $(PROGRAM).o game.o bombs1.o
-       $(CC) -o $(PROGRAM) \
-       $(PROGRAM).o bombs1.o game.o `wx-config --libs`
-
-$(PROGRAM).o: $(PROGRAM).cpp
-       $(CC) `wx-config --cflags` -c $(PROGRAM).cpp
-
-game.o: game.cpp
-       $(CC) `wx-config --cflags` -c game.cpp
-       
-bombs1.o: bombs1.cpp
-       $(CC) `wx-config --cflags` -c bombs1.cpp
-
-clean: 
-       rm -f *.o $(PROGRAM)

diff --git a/samples/bombs/makefile.unx b/samples/bombs/makefile.unx
new file mode 100644 (file)
index 0000000..738e5f4
--- /dev/null
+++ b/samples/bombs/makefile.unx
@@ -0,0 +1,34 @@
+#
+# File:                Makefile for samples
+# Author:      Robert Roebling
+# Created:     1999
+# Updated:     
+# Copyright:   (c) 1998 Robert Roebling
+#
+# This makefile requires a Unix version of wxWindows
+# to be installed on your system. This is most often
+# done typing "make install" when using the complete
+# sources of wxWindows or by installing the two
+# RPM packages wxGTK.XXX.rpm and wxGTK-devel.XXX.rpm
+# under Linux.
+#
+
+CC = gcc
+
+PROGRAM = bombs
+
+$(PROGRAM): $(PROGRAM).o game.o bombs1.o
+       $(CC) -o $(PROGRAM) \
+       $(PROGRAM).o bombs1.o game.o `wx-config --libs`
+
+$(PROGRAM).o: $(PROGRAM).cpp
+       $(CC) `wx-config --cflags` -c $(PROGRAM).cpp
+
+game.o: game.cpp
+       $(CC) `wx-config --cflags` -c game.cpp
+       
+bombs1.o: bombs1.cpp
+       $(CC) `wx-config --cflags` -c bombs1.cpp
+
+clean: 
+       rm -f *.o $(PROGRAM)

diff --git a/samples/caret/makefile.unx b/samples/caret/makefile.unx
new file mode 100644 (file)
index 0000000..f380360
--- /dev/null
+++ b/samples/caret/makefile.unx
@@ -0,0 +1,28 @@
+#
+# File:                Makefile for samples
+# Author:      Robert Roebling
+# Created:     1999
+# Updated:     
+# Copyright:   (c) 1998 Robert Roebling
+#
+# This makefile requires a Unix version of wxWindows
+# to be installed on your system. This is most often
+# done typing "make install" when using the complete
+# sources of wxWindows or by installing the two
+# RPM packages wxGTK.XXX.rpm and wxGTK-devel.XXX.rpm
+# under Linux.
+#
+
+CC = gcc
+
+PROGRAM = caret
+
+$(PROGRAM): $(PROGRAM).o
+       $(CC) -o $(PROGRAM) \
+       $(PROGRAM).o `wx-config --libs`
+
+$(PROGRAM).o: $(PROGRAM).cpp
+       $(CC) `wx-config --cflags` -c $(PROGRAM).cpp
+
+clean: 
+       rm -f *.o $(PROGRAM)

diff --git a/samples/checklst/makefile.unx b/samples/checklst/makefile.unx
new file mode 100644 (file)
index 0000000..9b7e114
--- /dev/null
+++ b/samples/checklst/makefile.unx
@@ -0,0 +1,28 @@
+#
+# File:                Makefile for samples
+# Author:      Robert Roebling
+# Created:     1999
+# Updated:     
+# Copyright:   (c) 1998 Robert Roebling
+#
+# This makefile requires a Unix version of wxWindows
+# to be installed on your system. This is most often
+# done typing "make install" when using the complete
+# sources of wxWindows or by installing the two
+# RPM packages wxGTK.XXX.rpm and wxGTK-devel.XXX.rpm
+# under Linux.
+#
+
+CC = gcc
+
+PROGRAM = checklst
+
+$(PROGRAM): $(PROGRAM).o
+       $(CC) -o $(PROGRAM) \
+       $(PROGRAM).o `wx-config --libs`
+
+$(PROGRAM).o: $(PROGRAM).cpp
+       $(CC) `wx-config --cflags` -c $(PROGRAM).cpp
+
+clean: 
+       rm -f *.o $(PROGRAM)

diff --git a/samples/config/makefile.unx b/samples/config/makefile.unx
new file mode 100644 (file)
index 0000000..fd8e0e5
--- /dev/null
+++ b/samples/config/makefile.unx
@@ -0,0 +1,28 @@
+#
+# File:                Makefile for samples
+# Author:      Robert Roebling
+# Created:     1999
+# Updated:     
+# Copyright:   (c) 1998 Robert Roebling
+#
+# This makefile requires a Unix version of wxWindows
+# to be installed on your system. This is most often
+# done typing "make install" when using the complete
+# sources of wxWindows or by installing the two
+# RPM packages wxGTK.XXX.rpm and wxGTK-devel.XXX.rpm
+# under Linux.
+#
+
+CC = gcc
+
+PROGRAM = config
+
+$(PROGRAM): $(PROGRAM).o
+       $(CC) -o $(PROGRAM) \
+       $(PROGRAM).o `wx-config --libs`
+
+$(PROGRAM).o: $(PROGRAM).cpp
+       $(CC) `wx-config --cflags` -c $(PROGRAM).cpp
+
+clean: 
+       rm -f *.o $(PROGRAM)

diff --git a/samples/controls/Makefile b/samples/controls/Makefile
deleted file mode 100644 (file)
index 28e0924..0000000
--- a/samples/controls/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-#
-# File:                Makefile for samples
-# Author:      Robert Roebling
-# Created:     1999
-# Updated:     
-# Copyright:   (c) 1998 Robert Roebling
-#
-# This makefile requires a Unix version of wxWindows
-# to be installed on your system. This is most often
-# done typing "make install" when using the complete
-# sources of wxWindows or by installing the two
-# RPM packages wxGTK.XXX.rpm and wxGTK-devel.XXX.rpm
-# under Linux.
-#
-
-CC = gcc
-
-PROGRAM = controls
-
-$(PROGRAM): $(PROGRAM).o
-       $(CC) -o $(PROGRAM) \
-       $(PROGRAM).o `wx-config --libs`
-
-$(PROGRAM).o: $(PROGRAM).cpp
-       $(CC) `wx-config --cflags` -c $(PROGRAM).cpp
-
-clean: 
-       rm -f *.o $(PROGRAM)

diff --git a/samples/controls/makefile.unx b/samples/controls/makefile.unx
new file mode 100644 (file)
index 0000000..28e0924
--- /dev/null
+++ b/samples/controls/makefile.unx
@@ -0,0 +1,28 @@
+#
+# File:                Makefile for samples
+# Author:      Robert Roebling
+# Created:     1999
+# Updated:     
+# Copyright:   (c) 1998 Robert Roebling
+#
+# This makefile requires a Unix version of wxWindows
+# to be installed on your system. This is most often
+# done typing "make install" when using the complete
+# sources of wxWindows or by installing the two
+# RPM packages wxGTK.XXX.rpm and wxGTK-devel.XXX.rpm
+# under Linux.
+#
+
+CC = gcc
+
+PROGRAM = controls
+
+$(PROGRAM): $(PROGRAM).o
+       $(CC) -o $(PROGRAM) \
+       $(PROGRAM).o `wx-config --libs`
+
+$(PROGRAM).o: $(PROGRAM).cpp
+       $(CC) `wx-config --cflags` -c $(PROGRAM).cpp
+
+clean: 
+       rm -f *.o $(PROGRAM)

diff --git a/samples/db/makefile.unx b/samples/db/makefile.unx
new file mode 100644 (file)
index 0000000..ff2dd68
--- /dev/null
+++ b/samples/db/makefile.unx
@@ -0,0 +1,31 @@
+#
+# File:                Makefile for samples
+# Author:      Robert Roebling
+# Created:     1999
+# Updated:     
+# Copyright:   (c) 1998 Robert Roebling
+#
+# This makefile requires a Unix version of wxWindows
+# to be installed on your system. This is most often
+# done typing "make install" when using the complete
+# sources of wxWindows or by installing the two
+# RPM packages wxGTK.XXX.rpm and wxGTK-devel.XXX.rpm
+# under Linux.
+#
+
+CC = gcc
+
+PROGRAM = dbtest
+
+$(PROGRAM): $(PROGRAM).o listdb.o
+       $(CC) -o $(PROGRAM) \
+       $(PROGRAM).o listdb.o `wx-config --libs`
+
+$(PROGRAM).o: $(PROGRAM).cpp
+       $(CC) `wx-config --cflags` -c $(PROGRAM).cpp
+
+listdb.o: listdb.cpp
+       $(CC) `wx-config --cflags` -c listdb.cpp
+       
+clean: 
+       rm -f *.o $(PROGRAM)

diff --git a/samples/dialogs/makefile.unx b/samples/dialogs/makefile.unx
new file mode 100644 (file)
index 0000000..9307e84
--- /dev/null
+++ b/samples/dialogs/makefile.unx
@@ -0,0 +1,28 @@
+#
+# File:                Makefile for samples
+# Author:      Robert Roebling
+# Created:     1999
+# Updated:     
+# Copyright:   (c) 1998 Robert Roebling
+#
+# This makefile requires a Unix version of wxWindows
+# to be installed on your system. This is most often
+# done typing "make install" when using the complete
+# sources of wxWindows or by installing the two
+# RPM packages wxGTK.XXX.rpm and wxGTK-devel.XXX.rpm
+# under Linux.
+#
+
+CC = gcc
+
+PROGRAM = dialogs
+
+$(PROGRAM): $(PROGRAM).o
+       $(CC) -o $(PROGRAM) \
+       $(PROGRAM).o `wx-config --libs`
+
+$(PROGRAM).o: $(PROGRAM).cpp
+       $(CC) `wx-config --cflags` -c $(PROGRAM).cpp
+
+clean: 
+       rm -f *.o $(PROGRAM)

diff --git a/samples/dnd/makefile.unx b/samples/dnd/makefile.unx
new file mode 100644 (file)
index 0000000..00993a6
--- /dev/null
+++ b/samples/dnd/makefile.unx
@@ -0,0 +1,28 @@
+#
+# File:                Makefile for samples
+# Author:      Robert Roebling
+# Created:     1999
+# Updated:     
+# Copyright:   (c) 1998 Robert Roebling
+#
+# This makefile requires a Unix version of wxWindows
+# to be installed on your system. This is most often
+# done typing "make install" when using the complete
+# sources of wxWindows or by installing the two
+# RPM packages wxGTK.XXX.rpm and wxGTK-devel.XXX.rpm
+# under Linux.
+#
+
+CC = gcc
+
+PROGRAM = dnd
+
+$(PROGRAM): $(PROGRAM).o
+       $(CC) -o $(PROGRAM) \
+       $(PROGRAM).o `wx-config --libs`
+
+$(PROGRAM).o: $(PROGRAM).cpp
+       $(CC) `wx-config --cflags` -c $(PROGRAM).cpp
+
+clean: 
+       rm -f *.o $(PROGRAM)

diff --git a/samples/printing/makefile.unx b/samples/printing/makefile.unx
new file mode 100644 (file)
index 0000000..1634560
--- /dev/null
+++ b/samples/printing/makefile.unx
@@ -0,0 +1,28 @@
+#
+# File:                Makefile for samples
+# Author:      Robert Roebling
+# Created:     1999
+# Updated:     
+# Copyright:   (c) 1998 Robert Roebling
+#
+# This makefile requires a Unix version of wxWindows
+# to be installed on your system. This is most often
+# done typing "make install" when using the complete
+# sources of wxWindows or by installing the two
+# RPM packages wxGTK.XXX.rpm and wxGTK-devel.XXX.rpm
+# under Linux.
+#
+
+CC = gcc
+
+PROGRAM = printing
+
+$(PROGRAM): $(PROGRAM).o
+       $(CC) -o $(PROGRAM) \
+       $(PROGRAM).o `wx-config --libs`
+
+$(PROGRAM).o: $(PROGRAM).cpp
+       $(CC) `wx-config --cflags` -c $(PROGRAM).cpp
+
+clean: 
+       rm -f *.o $(PROGRAM)

diff --git a/src/common/db.cpp b/src/common/db.cpp
index 5e34839f630b0c876008b1e0e2495842772dd96f..c9a7b9ae632ed395c15616cdd30a44e6cb54882d 100644 (file)
--- a/src/common/db.cpp
+++ b/src/common/db.cpp
@@ -97,18 +97,6 @@ DbList WXDLLEXPORT *PtrBegDbList = 0;
 #endif
 
 
-#ifdef __MWERKS__
-#ifdef __WXMSW__
-#define stricmp _stricmp
-#define strnicmp _strnicmp
-#else //__WXMSW_
-int strcasecmp(const char *str_1, const char *str_2) ;
-int strncasecmp(const char *str_1, const char *str_2, size_t maxchar) ;
-#define stricmp strcasecmp
-#define strnicmp strncasecmp
-#endif
-#endif //__MWERKS__
-
 // SQL Log defaults to be used by GetDbConnection
 enum sqlLog SQLLOGstate                                = sqlLogOFF;
 

diff --git a/src/common/dbtable.cpp b/src/common/dbtable.cpp
index 1113157d9028ab6076be760c361598f033d41673..51ff59a1a292a7bf41bd4f0a09604f8d3a0d0410 100644 (file)
--- a/src/common/dbtable.cpp
+++ b/src/common/dbtable.cpp
@@ -81,18 +81,6 @@
        #include "wx/dbtable.h"
 #endif
 
-#ifdef __MWERKS__
-#ifdef __WXMSW__
-#define stricmp _stricmp
-#define strnicmp _strnicmp
-#else
-int strcasecmp(const char *str_1, const char *str_2) ;
-int strncasecmp(const char *str_1, const char *str_2, size_t maxchar) ;
-#define stricmp strcasecmp
-#define strnicmp strncasecmp
-#endif
-#endif
-
 #ifdef __UNIX__
 // The HPUX preprocessor lines below were commented out on 8/20/97
 // because macros.h currently redefines DEBUG and is unneeded.

diff --git a/src/gtk/app.cpp b/src/gtk/app.cpp
index 4cd16593da2dcf5f29a81d6ec499bbaf3db8ebac..5d08196d7b2e1ebd346c18f3211b963cd805ee51 100644 (file)
--- a/src/gtk/app.cpp
+++ b/src/gtk/app.cpp
@@ -125,9 +125,12 @@ unsigned char g_palette[64*3] =
 extern void wxFlushResources();
 
 /* forward declaration */
-gint        wxapp_idle_callback( gpointer WXUNUSED(data) );
-void        wxapp_install_idle_handler();
-static gint wxapp_wakeup_timerout_callback( gpointer WXUNUSED(data) );
+gint   wxapp_idle_callback( gpointer WXUNUSED(data) );
+void   wxapp_install_idle_handler();
+
+#if wxUSE_THREADS
+gint   wxapp_wakeup_timerout_callback( gpointer WXUNUSED(data) );
+#endif
 
 //-----------------------------------------------------------------------------
 // wxExit
@@ -248,7 +251,7 @@ void wxapp_uninstall_thread_wakeup()
     wxTheApp->m_wakeUpTimerTag = 0;
 }
 
-static gint wxapp_wakeup_timerout_callback( gpointer WXUNUSED(data) )
+gint wxapp_wakeup_timerout_callback( gpointer WXUNUSED(data) )
 {
     wxapp_uninstall_thread_wakeup();
 

diff --git a/src/gtk/clipbrd.cpp b/src/gtk/clipbrd.cpp
index 9500db81e18abea33c5a5ad9fe98883d73c3ca9a..be5ef0127638d090f14a506899ca4de87775e2e7 100644 (file)
--- a/src/gtk/clipbrd.cpp
+++ b/src/gtk/clipbrd.cpp
@@ -475,7 +475,9 @@ bool wxClipboard::IsSupported( const wxDataFormat& format )
     /* store requested format to be asked for by callbacks */
     m_targetRequested = format;
 
+/*
     wxLogDebug( wxT("wxClipboard:IsSupported: requested format: %s"), format.GetId().c_str() );
+*/
 
     wxCHECK_MSG( m_targetRequested, FALSE, wxT("invalid clipboard format") );
 

diff --git a/src/gtk/dnd.cpp b/src/gtk/dnd.cpp
index e8e4232a2a81fc456350d614a5345ef69bec9266..25b6eb46f64c5b1b2958ea56337387bccf693d13 100644 (file)
--- a/src/gtk/dnd.cpp
+++ b/src/gtk/dnd.cpp
@@ -359,7 +359,7 @@ wxDragResult wxDropTarget::OnDragOver( wxCoord WXUNUSED(x),
 
     // disable the debug message from GetMatchingPair() - there are too many
     // of them otherwise
-#if 0 //def __WXDEBUG__
+#ifdef __WXDEBUG__
     wxLogNull noLog;
 #endif // Debug
 
@@ -763,6 +763,11 @@ wxDragResult wxDropSource::DoDragDrop( bool allowMove )
         PrepareIcon( 0, 0, context );
 
         while (m_waiting) gtk_main_iteration();;
+       
+       if (context->action == GDK_ACTION_COPY)
+            return m_retValue = wxDragCopy;
+       if (context->action == GDK_ACTION_MOVE)
+            return m_retValue = wxDragMove;
     }
 
 #if wxUSE_THREADS

diff --git a/src/gtk1/app.cpp b/src/gtk1/app.cpp
index 4cd16593da2dcf5f29a81d6ec499bbaf3db8ebac..5d08196d7b2e1ebd346c18f3211b963cd805ee51 100644 (file)
--- a/src/gtk1/app.cpp
+++ b/src/gtk1/app.cpp
@@ -125,9 +125,12 @@ unsigned char g_palette[64*3] =
 extern void wxFlushResources();
 
 /* forward declaration */
-gint        wxapp_idle_callback( gpointer WXUNUSED(data) );
-void        wxapp_install_idle_handler();
-static gint wxapp_wakeup_timerout_callback( gpointer WXUNUSED(data) );
+gint   wxapp_idle_callback( gpointer WXUNUSED(data) );
+void   wxapp_install_idle_handler();
+
+#if wxUSE_THREADS
+gint   wxapp_wakeup_timerout_callback( gpointer WXUNUSED(data) );
+#endif
 
 //-----------------------------------------------------------------------------
 // wxExit
@@ -248,7 +251,7 @@ void wxapp_uninstall_thread_wakeup()
     wxTheApp->m_wakeUpTimerTag = 0;
 }
 
-static gint wxapp_wakeup_timerout_callback( gpointer WXUNUSED(data) )
+gint wxapp_wakeup_timerout_callback( gpointer WXUNUSED(data) )
 {
     wxapp_uninstall_thread_wakeup();
 

diff --git a/src/gtk1/clipbrd.cpp b/src/gtk1/clipbrd.cpp
index 9500db81e18abea33c5a5ad9fe98883d73c3ca9a..be5ef0127638d090f14a506899ca4de87775e2e7 100644 (file)
--- a/src/gtk1/clipbrd.cpp
+++ b/src/gtk1/clipbrd.cpp
@@ -475,7 +475,9 @@ bool wxClipboard::IsSupported( const wxDataFormat& format )
     /* store requested format to be asked for by callbacks */
     m_targetRequested = format;
 
+/*
     wxLogDebug( wxT("wxClipboard:IsSupported: requested format: %s"), format.GetId().c_str() );
+*/
 
     wxCHECK_MSG( m_targetRequested, FALSE, wxT("invalid clipboard format") );
 

diff --git a/src/gtk1/dnd.cpp b/src/gtk1/dnd.cpp
index e8e4232a2a81fc456350d614a5345ef69bec9266..25b6eb46f64c5b1b2958ea56337387bccf693d13 100644 (file)
--- a/src/gtk1/dnd.cpp
+++ b/src/gtk1/dnd.cpp
@@ -359,7 +359,7 @@ wxDragResult wxDropTarget::OnDragOver( wxCoord WXUNUSED(x),
 
     // disable the debug message from GetMatchingPair() - there are too many
     // of them otherwise
-#if 0 //def __WXDEBUG__
+#ifdef __WXDEBUG__
     wxLogNull noLog;
 #endif // Debug
 
@@ -763,6 +763,11 @@ wxDragResult wxDropSource::DoDragDrop( bool allowMove )
         PrepareIcon( 0, 0, context );
 
         while (m_waiting) gtk_main_iteration();;
+       
+       if (context->action == GDK_ACTION_COPY)
+            return m_retValue = wxDragCopy;
+       if (context->action == GDK_ACTION_MOVE)
+            return m_retValue = wxDragMove;
     }
 
 #if wxUSE_THREADS