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

Added a few non-threads compile fixes,

Browse Source 
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
This commit is contained in:
Robert Roebling
1999-11-15 17:31:10 +00:00
parent 266b635a28
commit c4fda16bb0
19 changed files with 248 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Makefile.in
View File

@@ -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! # 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 cp $(SAMPDIR)/Makefile.in $(DISTDIR)/samples
mkdir $(DISTDIR)/samples/bombs mkdir $(DISTDIR)/samples/bombs
cp $(SAMPDIR)/bombs/Makefile.in $(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/*.cpp $(DISTDIR)/samples/bombs
cp $(SAMPDIR)/bombs/*.h $(DISTDIR)/samples/bombs cp $(SAMPDIR)/bombs/*.h $(DISTDIR)/samples/bombs
cp $(SAMPDIR)/bombs/*.xpm $(DISTDIR)/samples/bombs cp $(SAMPDIR)/bombs/*.xpm $(DISTDIR)/samples/bombs
cp $(SAMPDIR)/bombs/readme.txt $(DISTDIR)/samples/bombs cp $(SAMPDIR)/bombs/readme.txt $(DISTDIR)/samples/bombs
mkdir $(DISTDIR)/samples/caret mkdir $(DISTDIR)/samples/caret
cp $(SAMPDIR)/caret/Makefile.in $(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/*.cpp $(DISTDIR)/samples/caret
cp $(SAMPDIR)/caret/*.xpm $(DISTDIR)/samples/caret cp $(SAMPDIR)/caret/*.xpm $(DISTDIR)/samples/caret
mkdir $(DISTDIR)/samples/config mkdir $(DISTDIR)/samples/config
cp $(SAMPDIR)/config/Makefile.in $(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 cp $(SAMPDIR)/config/*.cpp $(DISTDIR)/samples/config
mkdir $(DISTDIR)/samples/controls mkdir $(DISTDIR)/samples/controls
mkdir $(DISTDIR)/samples/controls/icons mkdir $(DISTDIR)/samples/controls/icons
cp $(SAMPDIR)/controls/Makefile.in $(DISTDIR)/samples/controls 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/*.cpp $(DISTDIR)/samples/controls
cp $(SAMPDIR)/controls/*.xpm $(DISTDIR)/samples/controls cp $(SAMPDIR)/controls/*.xpm $(DISTDIR)/samples/controls
cp $(SAMPDIR)/controls/icons/*.??? $(DISTDIR)/samples/controls/icons cp $(SAMPDIR)/controls/icons/*.??? $(DISTDIR)/samples/controls/icons
mkdir $(DISTDIR)/samples/checklst mkdir $(DISTDIR)/samples/checklst
cp $(SAMPDIR)/checklst/Makefile.in $(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/*.cpp $(DISTDIR)/samples/checklst
cp $(SAMPDIR)/checklst/*.xpm $(DISTDIR)/samples/checklst cp $(SAMPDIR)/checklst/*.xpm $(DISTDIR)/samples/checklst
mkdir $(DISTDIR)/samples/printing mkdir $(DISTDIR)/samples/printing
cp $(SAMPDIR)/printing/Makefile.in $(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/*.cpp $(DISTDIR)/samples/printing
cp $(SAMPDIR)/printing/*.h $(DISTDIR)/samples/printing cp $(SAMPDIR)/printing/*.h $(DISTDIR)/samples/printing
cp $(SAMPDIR)/printing/*.xpm $(DISTDIR)/samples/printing cp $(SAMPDIR)/printing/*.xpm $(DISTDIR)/samples/printing
cp $(SAMPDIR)/printing/*.xbm $(DISTDIR)/samples/printing cp $(SAMPDIR)/printing/*.xbm $(DISTDIR)/samples/printing
mkdir $(DISTDIR)/samples/db mkdir $(DISTDIR)/samples/db
cp $(SAMPDIR)/db/Makefile.in $(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/*.cpp $(DISTDIR)/samples/db
cp $(SAMPDIR)/db/*.h $(DISTDIR)/samples/db cp $(SAMPDIR)/db/*.h $(DISTDIR)/samples/db
cp $(SAMPDIR)/db/*.xpm $(DISTDIR)/samples/db cp $(SAMPDIR)/db/*.xpm $(DISTDIR)/samples/db
mkdir $(DISTDIR)/samples/dialogs mkdir $(DISTDIR)/samples/dialogs
cp $(SAMPDIR)/dialogs/Makefile.in $(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/*.cpp $(DISTDIR)/samples/dialogs
cp $(SAMPDIR)/dialogs/*.h $(DISTDIR)/samples/dialogs cp $(SAMPDIR)/dialogs/*.h $(DISTDIR)/samples/dialogs
cp $(SAMPDIR)/dialogs/*.txt $(DISTDIR)/samples/dialogs cp $(SAMPDIR)/dialogs/*.txt $(DISTDIR)/samples/dialogs
mkdir $(DISTDIR)/samples/dnd mkdir $(DISTDIR)/samples/dnd
cp $(SAMPDIR)/dnd/Makefile.in $(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/*.wxr $(DISTDIR)/samples/dnd
cp $(SAMPDIR)/dnd/*.cpp $(DISTDIR)/samples/dnd cp $(SAMPDIR)/dnd/*.cpp $(DISTDIR)/samples/dnd
cp $(SAMPDIR)/dnd/*.xpm $(DISTDIR)/samples/dnd cp $(SAMPDIR)/dnd/*.xpm $(DISTDIR)/samples/dnd

11
distrib/msw/tmake/unx.t
View File

@@ -780,47 +780,54 @@ SAMPLES_DIST:
cp $(SAMPDIR)/Makefile.in $(DISTDIR)/samples cp $(SAMPDIR)/Makefile.in $(DISTDIR)/samples
mkdir $(DISTDIR)/samples/bombs mkdir $(DISTDIR)/samples/bombs
cp $(SAMPDIR)/bombs/Makefile.in $(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/*.cpp $(DISTDIR)/samples/bombs
cp $(SAMPDIR)/bombs/*.h $(DISTDIR)/samples/bombs cp $(SAMPDIR)/bombs/*.h $(DISTDIR)/samples/bombs
cp $(SAMPDIR)/bombs/*.xpm $(DISTDIR)/samples/bombs cp $(SAMPDIR)/bombs/*.xpm $(DISTDIR)/samples/bombs
cp $(SAMPDIR)/bombs/readme.txt $(DISTDIR)/samples/bombs cp $(SAMPDIR)/bombs/readme.txt $(DISTDIR)/samples/bombs
mkdir $(DISTDIR)/samples/caret mkdir $(DISTDIR)/samples/caret
cp $(SAMPDIR)/caret/Makefile.in $(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/*.cpp $(DISTDIR)/samples/caret
cp $(SAMPDIR)/caret/*.xpm $(DISTDIR)/samples/caret cp $(SAMPDIR)/caret/*.xpm $(DISTDIR)/samples/caret
mkdir $(DISTDIR)/samples/config mkdir $(DISTDIR)/samples/config
cp $(SAMPDIR)/config/Makefile.in $(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 cp $(SAMPDIR)/config/*.cpp $(DISTDIR)/samples/config
mkdir $(DISTDIR)/samples/controls mkdir $(DISTDIR)/samples/controls
mkdir $(DISTDIR)/samples/controls/icons mkdir $(DISTDIR)/samples/controls/icons
cp $(SAMPDIR)/controls/Makefile.in $(DISTDIR)/samples/controls 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/*.cpp $(DISTDIR)/samples/controls
cp $(SAMPDIR)/controls/*.xpm $(DISTDIR)/samples/controls cp $(SAMPDIR)/controls/*.xpm $(DISTDIR)/samples/controls
cp $(SAMPDIR)/controls/icons/*.??? $(DISTDIR)/samples/controls/icons cp $(SAMPDIR)/controls/icons/*.??? $(DISTDIR)/samples/controls/icons
mkdir $(DISTDIR)/samples/checklst mkdir $(DISTDIR)/samples/checklst
cp $(SAMPDIR)/checklst/Makefile.in $(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/*.cpp $(DISTDIR)/samples/checklst
cp $(SAMPDIR)/checklst/*.xpm $(DISTDIR)/samples/checklst cp $(SAMPDIR)/checklst/*.xpm $(DISTDIR)/samples/checklst
mkdir $(DISTDIR)/samples/printing mkdir $(DISTDIR)/samples/printing
cp $(SAMPDIR)/printing/Makefile.in $(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/*.cpp $(DISTDIR)/samples/printing
cp $(SAMPDIR)/printing/*.h $(DISTDIR)/samples/printing cp $(SAMPDIR)/printing/*.h $(DISTDIR)/samples/printing
cp $(SAMPDIR)/printing/*.xpm $(DISTDIR)/samples/printing cp $(SAMPDIR)/printing/*.xpm $(DISTDIR)/samples/printing
cp $(SAMPDIR)/printing/*.xbm $(DISTDIR)/samples/printing cp $(SAMPDIR)/printing/*.xbm $(DISTDIR)/samples/printing
mkdir $(DISTDIR)/samples/db mkdir $(DISTDIR)/samples/db
cp $(SAMPDIR)/db/Makefile.in $(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/*.cpp $(DISTDIR)/samples/db
cp $(SAMPDIR)/db/*.h $(DISTDIR)/samples/db cp $(SAMPDIR)/db/*.h $(DISTDIR)/samples/db
cp $(SAMPDIR)/db/*.xpm $(DISTDIR)/samples/db cp $(SAMPDIR)/db/*.xpm $(DISTDIR)/samples/db
mkdir $(DISTDIR)/samples/dialogs mkdir $(DISTDIR)/samples/dialogs
cp $(SAMPDIR)/dialogs/Makefile.in $(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/*.cpp $(DISTDIR)/samples/dialogs
cp $(SAMPDIR)/dialogs/*.h $(DISTDIR)/samples/dialogs cp $(SAMPDIR)/dialogs/*.h $(DISTDIR)/samples/dialogs
cp $(SAMPDIR)/dialogs/*.txt $(DISTDIR)/samples/dialogs cp $(SAMPDIR)/dialogs/*.txt $(DISTDIR)/samples/dialogs
mkdir $(DISTDIR)/samples/dnd mkdir $(DISTDIR)/samples/dnd
cp $(SAMPDIR)/dnd/Makefile.in $(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/*.wxr $(DISTDIR)/samples/dnd
cp $(SAMPDIR)/dnd/*.cpp $(DISTDIR)/samples/dnd cp $(SAMPDIR)/dnd/*.cpp $(DISTDIR)/samples/dnd
cp $(SAMPDIR)/dnd/*.xpm $(DISTDIR)/samples/dnd cp $(SAMPDIR)/dnd/*.xpm $(DISTDIR)/samples/dnd

0
samples/bombs/Makefile → samples/bombs/makefile.unx
View File

28
samples/caret/makefile.unx Normal file
View File

@@ -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)

28
samples/checklst/makefile.unx Normal file
View File

@@ -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)

28
samples/config/makefile.unx Normal file
View File

@@ -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)

0
samples/controls/Makefile → samples/controls/makefile.unx
View File

31
samples/db/makefile.unx Normal file
View File

@@ -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)

28
samples/dialogs/makefile.unx Normal file
View File

@@ -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)

28
samples/dnd/makefile.unx Normal file
View File

@@ -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)

28
samples/printing/makefile.unx Normal file
View File

@@ -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)

12
src/common/db.cpp
View File

@@ -97,18 +97,6 @@ DbList WXDLLEXPORT *PtrBegDbList = 0;
#endif #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 // SQL Log defaults to be used by GetDbConnection
enum sqlLog SQLLOGstate = sqlLogOFF; enum sqlLog SQLLOGstate = sqlLogOFF;

12
src/common/dbtable.cpp
View File

@@ -81,18 +81,6 @@
#include "wx/dbtable.h" #include "wx/dbtable.h"
#endif #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__ #ifdef __UNIX__
// The HPUX preprocessor lines below were commented out on 8/20/97 // The HPUX preprocessor lines below were commented out on 8/20/97
// because macros.h currently redefines DEBUG and is unneeded. // because macros.h currently redefines DEBUG and is unneeded.

11
src/gtk/app.cpp
View File

@@ -125,9 +125,12 @@ unsigned char g_palette[64*3] =
extern void wxFlushResources(); extern void wxFlushResources();
/* forward declaration */ /* forward declaration */
gint wxapp_idle_callback( gpointer WXUNUSED(data) ); gint wxapp_idle_callback( gpointer WXUNUSED(data) );
void wxapp_install_idle_handler(); void wxapp_install_idle_handler();
static gint wxapp_wakeup_timerout_callback( gpointer WXUNUSED(data) );
#if wxUSE_THREADS
gint wxapp_wakeup_timerout_callback( gpointer WXUNUSED(data) );
#endif
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// wxExit // wxExit
@@ -248,7 +251,7 @@ void wxapp_uninstall_thread_wakeup()
wxTheApp->m_wakeUpTimerTag = 0; 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(); wxapp_uninstall_thread_wakeup();

2
src/gtk/clipbrd.cpp
View File

@@ -475,7 +475,9 @@ bool wxClipboard::IsSupported( const wxDataFormat& format )
/* store requested format to be asked for by callbacks */ /* store requested format to be asked for by callbacks */
m_targetRequested = format; m_targetRequested = format;
/*
wxLogDebug( wxT("wxClipboard:IsSupported: requested format: %s"), format.GetId().c_str() ); wxLogDebug( wxT("wxClipboard:IsSupported: requested format: %s"), format.GetId().c_str() );
*/
wxCHECK_MSG( m_targetRequested, FALSE, wxT("invalid clipboard format") ); wxCHECK_MSG( m_targetRequested, FALSE, wxT("invalid clipboard format") );

7
src/gtk/dnd.cpp
View File

@@ -359,7 +359,7 @@ wxDragResult wxDropTarget::OnDragOver( wxCoord WXUNUSED(x),
// disable the debug message from GetMatchingPair() - there are too many // disable the debug message from GetMatchingPair() - there are too many
// of them otherwise // of them otherwise
#if 0 //def __WXDEBUG__ #ifdef __WXDEBUG__
wxLogNull noLog; wxLogNull noLog;
#endif // Debug #endif // Debug
@@ -763,6 +763,11 @@ wxDragResult wxDropSource::DoDragDrop( bool allowMove )
PrepareIcon( 0, 0, context ); PrepareIcon( 0, 0, context );
while (m_waiting) gtk_main_iteration();; 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 #if wxUSE_THREADS

11
src/gtk1/app.cpp
View File

@@ -125,9 +125,12 @@ unsigned char g_palette[64*3] =
extern void wxFlushResources(); extern void wxFlushResources();
/* forward declaration */ /* forward declaration */
gint wxapp_idle_callback( gpointer WXUNUSED(data) ); gint wxapp_idle_callback( gpointer WXUNUSED(data) );
void wxapp_install_idle_handler(); void wxapp_install_idle_handler();
static gint wxapp_wakeup_timerout_callback( gpointer WXUNUSED(data) );
#if wxUSE_THREADS
gint wxapp_wakeup_timerout_callback( gpointer WXUNUSED(data) );
#endif
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// wxExit // wxExit
@@ -248,7 +251,7 @@ void wxapp_uninstall_thread_wakeup()
wxTheApp->m_wakeUpTimerTag = 0; 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(); wxapp_uninstall_thread_wakeup();

2
src/gtk1/clipbrd.cpp
View File

@@ -475,7 +475,9 @@ bool wxClipboard::IsSupported( const wxDataFormat& format )
/* store requested format to be asked for by callbacks */ /* store requested format to be asked for by callbacks */
m_targetRequested = format; m_targetRequested = format;
/*
wxLogDebug( wxT("wxClipboard:IsSupported: requested format: %s"), format.GetId().c_str() ); wxLogDebug( wxT("wxClipboard:IsSupported: requested format: %s"), format.GetId().c_str() );
*/
wxCHECK_MSG( m_targetRequested, FALSE, wxT("invalid clipboard format") ); wxCHECK_MSG( m_targetRequested, FALSE, wxT("invalid clipboard format") );

7
src/gtk1/dnd.cpp
View File

@@ -359,7 +359,7 @@ wxDragResult wxDropTarget::OnDragOver( wxCoord WXUNUSED(x),
// disable the debug message from GetMatchingPair() - there are too many // disable the debug message from GetMatchingPair() - there are too many
// of them otherwise // of them otherwise
#if 0 //def __WXDEBUG__ #ifdef __WXDEBUG__
wxLogNull noLog; wxLogNull noLog;
#endif // Debug #endif // Debug
@@ -763,6 +763,11 @@ wxDragResult wxDropSource::DoDragDrop( bool allowMove )
PrepareIcon( 0, 0, context ); PrepareIcon( 0, 0, context );
while (m_waiting) gtk_main_iteration();; 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 #if wxUSE_THREADS