AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compilation fixes

Browse Source 
Found out how to do wxUSE_XX 0 and 1


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1324 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling 1999-01-06 21:09:17 +00:00
parent 471aebdd3e
commit 06cfab1738
38 changed files with 201 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/gtk/clipbrd.h
View File

@ -17,7 +17,7 @@
#include "wx/defs.h" #include "wx/defs.h"
#ifdef wxUSE_CLIPBOARD #if wxUSE_CLIPBOARD
#include "wx/object.h" #include "wx/object.h"
#include "wx/list.h" #include "wx/list.h"

2
include/wx/gtk/combobox.h
View File

@ -18,7 +18,7 @@
#include "wx/defs.h" #include "wx/defs.h"
#ifdef wxUSE_COMBOBOX #if wxUSE_COMBOBOX
#include "wx/object.h" #include "wx/object.h"
#include "wx/control.h" #include "wx/control.h"

4
include/wx/gtk/dcps.h
View File

@ -16,11 +16,13 @@
#endif #endif
#include "wx/dc.h" #include "wx/dc.h"
#if wxUSE_POSTSCRIPT
#include "wx/dialog.h" #include "wx/dialog.h"
#include "wx/module.h" #include "wx/module.h"
#include <fstream.h> #include <fstream.h>
#if wxUSE_POSTSCRIPT
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// classes // classes

2
include/wx/gtk/dnd.h
View File

@ -17,7 +17,7 @@
#include "wx/defs.h" #include "wx/defs.h"
#ifdef wxUSE_DRAG_AND_DROP #if wxUSE_DRAG_AND_DROP
#include "wx/object.h" #include "wx/object.h"
#include "wx/string.h" #include "wx/string.h"

2
include/wx/gtk/listbox.h
View File

@ -91,7 +91,7 @@ public:
void SetString( int n, const wxString &string ); void SetString( int n, const wxString &string );
void SetStringSelection( const wxString &string, bool select = TRUE ); void SetStringSelection( const wxString &string, bool select = TRUE );
#ifdef wxUSE_DRAG_AND_DROP #if wxUSE_DRAG_AND_DROP
void SetDropTarget( wxDropTarget *dropTarget ); void SetDropTarget( wxDropTarget *dropTarget );
#endif #endif

8
include/wx/gtk/window.h
View File

@ -42,11 +42,11 @@ class wxDC;
class wxClientData; class wxClientData;
class wxVoidClientData; class wxVoidClientData;
class wxWindow; class wxWindow;
#ifdef wxUSE_WX_RESOURCES #if wxUSE_WX_RESOURCES
class wxResourceTable; class wxResourceTable;
class wxItemResource; class wxItemResource;
#endif #endif
#ifdef wxUSE_DRAG_AND_DROP #if wxUSE_DRAG_AND_DROP
class wxDropTarget; class wxDropTarget;
#endif #endif
@ -290,7 +290,7 @@ public:
virtual bool PopupMenu( wxMenu *menu, int x, int y ); virtual bool PopupMenu( wxMenu *menu, int x, int y );
#ifdef wxUSE_DRAG_AND_DROP #if wxUSE_DRAG_AND_DROP
virtual void SetDropTarget( wxDropTarget *dropTarget ); virtual void SetDropTarget( wxDropTarget *dropTarget );
virtual wxDropTarget *GetDropTarget() const; virtual wxDropTarget *GetDropTarget() const;
#endif #endif
@ -335,7 +335,7 @@ public:
int m_retCode; int m_retCode;
wxEvtHandler *m_eventHandler; wxEvtHandler *m_eventHandler;
wxValidator *m_windowValidator; wxValidator *m_windowValidator;
#ifdef wxUSE_DRAG_AND_DROP #if wxUSE_DRAG_AND_DROP
wxDropTarget *m_dropTarget; wxDropTarget *m_dropTarget;
#endif #endif
wxWindowID m_windowId; wxWindowID m_windowId;

2
include/wx/gtk1/clipbrd.h
View File

@ -17,7 +17,7 @@
#include "wx/defs.h" #include "wx/defs.h"
#ifdef wxUSE_CLIPBOARD #if wxUSE_CLIPBOARD
#include "wx/object.h" #include "wx/object.h"
#include "wx/list.h" #include "wx/list.h"

2
include/wx/gtk1/combobox.h
View File

@ -18,7 +18,7 @@
#include "wx/defs.h" #include "wx/defs.h"
#ifdef wxUSE_COMBOBOX #if wxUSE_COMBOBOX
#include "wx/object.h" #include "wx/object.h"
#include "wx/control.h" #include "wx/control.h"

4
include/wx/gtk1/dcps.h
View File

@ -16,11 +16,13 @@
#endif #endif
#include "wx/dc.h" #include "wx/dc.h"
#if wxUSE_POSTSCRIPT
#include "wx/dialog.h" #include "wx/dialog.h"
#include "wx/module.h" #include "wx/module.h"
#include <fstream.h> #include <fstream.h>
#if wxUSE_POSTSCRIPT
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// classes // classes

2
include/wx/gtk1/dnd.h
View File

@ -17,7 +17,7 @@
#include "wx/defs.h" #include "wx/defs.h"
#ifdef wxUSE_DRAG_AND_DROP #if wxUSE_DRAG_AND_DROP
#include "wx/object.h" #include "wx/object.h"
#include "wx/string.h" #include "wx/string.h"

2
include/wx/gtk1/listbox.h
View File

@ -91,7 +91,7 @@ public:
void SetString( int n, const wxString &string ); void SetString( int n, const wxString &string );
void SetStringSelection( const wxString &string, bool select = TRUE ); void SetStringSelection( const wxString &string, bool select = TRUE );
#ifdef wxUSE_DRAG_AND_DROP #if wxUSE_DRAG_AND_DROP
void SetDropTarget( wxDropTarget *dropTarget ); void SetDropTarget( wxDropTarget *dropTarget );
#endif #endif

8
include/wx/gtk1/window.h
View File

@ -42,11 +42,11 @@ class wxDC;
class wxClientData; class wxClientData;
class wxVoidClientData; class wxVoidClientData;
class wxWindow; class wxWindow;
#ifdef wxUSE_WX_RESOURCES #if wxUSE_WX_RESOURCES
class wxResourceTable; class wxResourceTable;
class wxItemResource; class wxItemResource;
#endif #endif
#ifdef wxUSE_DRAG_AND_DROP #if wxUSE_DRAG_AND_DROP
class wxDropTarget; class wxDropTarget;
#endif #endif
@ -290,7 +290,7 @@ public:
virtual bool PopupMenu( wxMenu *menu, int x, int y ); virtual bool PopupMenu( wxMenu *menu, int x, int y );
#ifdef wxUSE_DRAG_AND_DROP #if wxUSE_DRAG_AND_DROP
virtual void SetDropTarget( wxDropTarget *dropTarget ); virtual void SetDropTarget( wxDropTarget *dropTarget );
virtual wxDropTarget *GetDropTarget() const; virtual wxDropTarget *GetDropTarget() const;
#endif #endif
@ -335,7 +335,7 @@ public:
int m_retCode; int m_retCode;
wxEvtHandler *m_eventHandler; wxEvtHandler *m_eventHandler;
wxValidator *m_windowValidator; wxValidator *m_windowValidator;
#ifdef wxUSE_DRAG_AND_DROP #if wxUSE_DRAG_AND_DROP
wxDropTarget *m_dropTarget; wxDropTarget *m_dropTarget;
#endif #endif
wxWindowID m_windowId; wxWindowID m_windowId;

11
include/wx/odbc.h
View File

@ -24,11 +24,16 @@
#include <windows.h> #include <windows.h>
#endif #endif
#ifdef __WXGTK__ #ifdef __WXGTK__
extern "C" { extern "C" {
#include <../iodbc/postgres/isqlext.h> #include <../iodbc/isql.h>
#include <../iodbc/postgres/odbc_funcs.h> #include <../iodbc/isqlext.h>
#include <../iodbc/postgres/odbc_types.h> #include <../iodbc/odbc_funcs.h>
#include <../iodbc/odbc_types.h>
typedef float SFLOAT;
typedef double SDOUBLE;
#define ULONG UDWORD
} }
#else #else
#include <sqlext.h> #include <sqlext.h>

4
include/wx/thread.h
View File

@ -106,6 +106,8 @@ private:
wxMutex *m_mutex; wxMutex *m_mutex;
}; };
#ifdef __WXMSW__
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// Critical section: this is the same as mutex but is only visible to the // Critical section: this is the same as mutex but is only visible to the
// threads of the same process. For the platforms which don't have native // threads of the same process. For the platforms which don't have native
@ -146,6 +148,8 @@ private:
wxCriticalSection *m_critsect; wxCriticalSection *m_critsect;
}; };
#endif
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// Condition handler. // Condition handler.
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------

67
setup/setup.hin
View File

@ -42,22 +42,22 @@
/* /*
* Use zlib * Use zlib
*/ */
#undef wxUSE_ZLIB #define wxUSE_ZLIB 0
/* /*
* Use libpng * Use libpng
*/ */
#undef wxUSE_LIBPNG #define wxUSE_LIBPNG 0
/* /*
* Use iODBC * Use iODBC
*/ */
#undef wxUSE_ODBC #define wxUSE_ODBC 0
/* /*
* Use Threads * Use Threads
*/ */
#undef wxUSE_THREADS #define wxUSE_THREADS 0
//------------------------------------------------------------------------ //------------------------------------------------------------------------
// GUI control options // GUI control options (allways enabled in wxGTK)
//------------------------------------------------------------------------ //------------------------------------------------------------------------
/* /*
@ -84,23 +84,28 @@
/* /*
* Use time and date classes * Use time and date classes
*/ */
#undef wxUSE_TIMEDATE #define wxUSE_TIMEDATE 0
/* /*
* Use config system * Use config system
*/ */
#undef wxUSE_CONFIG #define wxUSE_CONFIG 0
/* /*
* Use intl system * Use intl system
*/ */
#undef wxUSE_INTL #define wxUSE_INTL 0
/* /*
* Use streams * Use streams
*/ */
#undef wxUSE_STREAMS #define wxUSE_STREAMS 0
/* /*
* Use class serialization * Use class serialization
*/ */
#undef wxUSE_SERIAL #define wxUSE_SERIAL 0
/*
* Use standard C++ streams if 1. If 0, use wxWin
* streams implementation.
*/
#define wxUSE_STD_IOSTREAM 1
//------------------------------------------------------------------------ //------------------------------------------------------------------------
// PS options // PS options
@ -110,12 +115,12 @@
* Use font metric files in GetTextExtent for wxPostScriptDC * Use font metric files in GetTextExtent for wxPostScriptDC
* Use consistent PostScript fonts for AFM and printing (!) * Use consistent PostScript fonts for AFM and printing (!)
*/ */
#undef wxUSE_AFM_FOR_POSTSCRIPT #define wxUSE_AFM_FOR_POSTSCRIPT 0
#undef WX_NORMALIZED_PS_FONTS #define WX_NORMALIZED_PS_FONTS 0
/* /*
* Use PostScript device context * Use PostScript device context
*/ */
#undef wxUSE_POSTSCRIPT #define wxUSE_POSTSCRIPT 0
//------------------------------------------------------------------------ //------------------------------------------------------------------------
// wxString options // wxString options
@ -124,7 +129,7 @@
/* /*
* Compile wxString with wide character (Unicode) support? * Compile wxString with wide character (Unicode) support?
*/ */
#undef wxUSE_UNICODE #define wxUSE_UNICODE 0
/* /*
* Work around a bug in GNU libc 5.x wcstombs() implementation. * Work around a bug in GNU libc 5.x wcstombs() implementation.
@ -133,7 +138,7 @@
* have libc 5 (you should enable this for libc6 where wcsrtombs() is * have libc 5 (you should enable this for libc6 where wcsrtombs() is
* thread-safe version of wcstombs()). * thread-safe version of wcstombs()).
*/ */
#undef wxUSE_WCSRTOMBS #define wxUSE_WCSRTOMBS 0
//------------------------------------------------------------------------ //------------------------------------------------------------------------
// misc options // misc options
@ -142,19 +147,19 @@
/* /*
* Use Interprocess communication * Use Interprocess communication
*/ */
#undef wxUSE_IPC #define wxUSE_IPC 0
/* /*
* Use wxGetResource & wxWriteResource (change .Xdefaults) * Use wxGetResource & wxWriteResource (change .Xdefaults)
*/ */
#undef wxUSE_RESOURCES #define wxUSE_RESOURCES 0
/* /*
* Use clipboard * Use clipboard
*/ */
#undef wxUSE_CLIPBOARD #define wxUSE_CLIPBOARD 0
/* /*
* Use dnd * Use dnd
*/ */
#undef wxUSE_DRAG_AND_DROP #define wxUSE_DRAG_AND_DROP 0
//------------------------------------------------------------------------ //------------------------------------------------------------------------
// architecture options // architecture options
@ -163,15 +168,15 @@
/* /*
* Use the mdi architecture * Use the mdi architecture
*/ */
#undef wxUSE_MDI_ARCHITECTURE #define wxUSE_MDI_ARCHITECTURE 0
/* /*
* Use the document/view architecture * Use the document/view architecture
*/ */
#undef wxUSE_DOC_VIEW_ARCHITECTURE #define wxUSE_DOC_VIEW_ARCHITECTURE 0
/* /*
* Use the print/preview architecture * Use the print/preview architecture
*/ */
#undef wxUSE_PRINTING_ARCHITECTURE #define wxUSE_PRINTING_ARCHITECTURE 0
//------------------------------------------------------------------------ //------------------------------------------------------------------------
// Prolog and wxWindows' resource system options // Prolog and wxWindows' resource system options
@ -180,15 +185,15 @@
/* /*
* Use Prolog IO * Use Prolog IO
*/ */
#undef wxUSE_PROLOGIO #define wxUSE_PROLOGIO 0
/* /*
* Use Remote Procedure Call (Needs wxUSE_IPC and wxUSE_PROLOGIO) * Use Remote Procedure Call (Needs wxUSE_IPC and wxUSE_PROLOGIO)
*/ */
#undef wxUSE_RPC #define wxUSE_RPC 0
/* /*
* Use wxWindows resource loading (.wxr-files) (Needs wxUSE_PROLOGIO 1) * Use wxWindows resource loading (.wxr-files) (Needs wxUSE_PROLOGIO 1)
*/ */
#undef wxUSE_WX_RESOURCES #define wxUSE_WX_RESOURCES 0
//------------------------------------------------------------------------ //------------------------------------------------------------------------
// the rest // the rest
@ -197,15 +202,15 @@
/* /*
* Use wxWindows help facility (needs wxUSE_IPC 1) * Use wxWindows help facility (needs wxUSE_IPC 1)
*/ */
#undef wxUSE_HELP #define wxUSE_HELP 0
/* /*
* Use iostream.h rather than iostream * Use iostream.h rather than iostream
*/ */
#undef wxUSE_IOSTREAMH #define wxUSE_IOSTREAMH 0
/* /*
* Use Apple Ieee-double converter * Use Apple Ieee-double converter
*/ */
#undef wxUSE_APPLE_IEEE #define wxUSE_APPLE_IEEE 0
/* Compatibility with 1.66 API. /* Compatibility with 1.66 API.
Level 0: no backward compatibility, all new features Level 0: no backward compatibility, all new features
Level 1: wxDC, OnSize (etc.) compatibility, but Level 1: wxDC, OnSize (etc.) compatibility, but
@ -214,18 +219,18 @@
/* /*
* Enables debugging: memory tracing, assert, etc., contains debug level * Enables debugging: memory tracing, assert, etc., contains debug level
*/ */
#undef WXDEBUG #define WXDEBUG 0
/* /*
* Enables debugging version of wxObject::new and wxObject::delete (IF WXDEBUG) * Enables debugging version of wxObject::new and wxObject::delete (IF WXDEBUG)
* WARNING: this code may not work with all architectures, especially * WARNING: this code may not work with all architectures, especially
* if alignment is an issue. * if alignment is an issue.
*/ */
#undef wxUSE_MEMORY_TRACING #define wxUSE_MEMORY_TRACING 0
/* /*
* Enable debugging version of global memory operators new and delete * Enable debugging version of global memory operators new and delete
* Disable it, If this causes problems (e.g. link errors) * Disable it, If this causes problems (e.g. link errors)
*/ */
#undef wxUSE_GLOBAL_MEMORY_OPERATORS #define wxUSE_GLOBAL_MEMORY_OPERATORS 0
/* /*
* Matthews garbage collection (used for MrEd?) * Matthews garbage collection (used for MrEd?)
*/ */

19
src/common/image.cpp
View File

@ -722,13 +722,13 @@ bool wxBMPHandler::LoadFile( wxImage *image, const wxString& name )
int height = (int)dbuf[1]; int height = (int)dbuf[1];
if (width > 32767) if (width > 32767)
{ {
fprintf(stderr, "IMLIB ERROR: Image width > 32767 pixels for file\n"); wxLogError( "Image width > 32767 pixels for file\n" );
fclose(file); fclose(file);
return FALSE; return FALSE;
} }
if (height > 32767) if (height > 32767)
{ {
fprintf(stderr, "IMLIB ERROR: Image height > 32767 pixels for file\n"); wxLogError( "Image height > 32767 pixels for file\n" );
fclose(file); fclose(file);
return FALSE; return FALSE;
} }
@ -738,7 +738,7 @@ bool wxBMPHandler::LoadFile( wxImage *image, const wxString& name )
bpp = (int)word; bpp = (int)word;
if (bpp != 1 && bpp != 4 && bpp != 8 && bpp && 16 && bpp != 24 && bpp != 32) if (bpp != 1 && bpp != 4 && bpp != 8 && bpp && 16 && bpp != 24 && bpp != 32)
{ {
fprintf(stderr, "IMLIB ERROR: unknown bitdepth in file\n"); wxLogError( "unknown bitdepth in file\n" );
fclose(file); fclose(file);
return FALSE; return FALSE;
} }
@ -746,7 +746,7 @@ bool wxBMPHandler::LoadFile( wxImage *image, const wxString& name )
comp = (int)dbuf[0]; comp = (int)dbuf[0];
if (comp != BI_RGB && comp != BI_RLE4 && comp != BI_RLE8 && comp != BI_BITFIELDS) if (comp != BI_RGB && comp != BI_RLE4 && comp != BI_RLE8 && comp != BI_BITFIELDS)
{ {
fprintf(stderr, "IMLIB ERROR: unknown encoding in Windows BMP file\n"); wxLogError( "unknown encoding in Windows BMP file\n" );
fclose(file); fclose(file);
return FALSE; return FALSE;
} }
@ -757,7 +757,7 @@ bool wxBMPHandler::LoadFile( wxImage *image, const wxString& name )
/* some more sanity checks */ /* some more sanity checks */
if (((comp == BI_RLE4) && (bpp != 4)) || ((comp == BI_RLE8) && (bpp != 8)) || ((comp == BI_BITFIELDS) && (bpp != 16 && bpp != 32))) if (((comp == BI_RLE4) && (bpp != 4)) || ((comp == BI_RLE8) && (bpp != 8)) || ((comp == BI_BITFIELDS) && (bpp != 16 && bpp != 32)))
{ {
fprintf(stderr, "IMLIB ERROR: encoding of BMP doesn't match bitdepth\n"); wxLogError( "encoding of BMP doesn't match bitdepth\n" );
fclose(file); fclose(file);
return FALSE; return FALSE;
} }
@ -767,7 +767,7 @@ bool wxBMPHandler::LoadFile( wxImage *image, const wxString& name )
if (!cmap) if (!cmap)
{ {
fprintf(stderr, "IMLIB ERROR: Cannot allocate RAM for color map in BMP file\n"); wxLogError( "Cannot allocate RAM for color map in BMP file\n" );
fclose(file); fclose(file);
return FALSE; return FALSE;
} }
@ -779,7 +779,7 @@ bool wxBMPHandler::LoadFile( wxImage *image, const wxString& name )
ptr = image->GetData(); ptr = image->GetData();
if (!ptr) if (!ptr)
{ {
fprintf(stderr, "IMLIB ERROR: Cannot allocate RAM for RGB data in file\n"); wxLogError( "Cannot allocate RAM for RGB data in file\n" );
fclose(file); fclose(file);
if (cmap) if (cmap)
free(cmap); free(cmap);
@ -894,7 +894,7 @@ bool wxBMPHandler::LoadFile( wxImage *image, const wxString& name )
{ {
if (comp == BI_RLE4) if (comp == BI_RLE4)
{ {
fprintf(stderr, "can't deal with 4bit encoded yet.\n"); wxLogError( "can't deal with 4bit encoded yet.\n");
image->Destroy(); image->Destroy();
free(cmap); free(cmap);
return FALSE; return FALSE;
@ -1296,6 +1296,9 @@ wxBitmap wxImage::ConvertToBitmap() const
GdkVisual *visual = gdk_window_get_visual( bitmap.GetPixmap() ); GdkVisual *visual = gdk_window_get_visual( bitmap.GetPixmap() );
if (visual == NULL) visual = gdk_window_get_visual( (GdkWindow*) &gdk_root_parent ); if (visual == NULL) visual = gdk_window_get_visual( (GdkWindow*) &gdk_root_parent );
int bpp = visual->depth; int bpp = visual->depth;
bitmap.SetDepth( bpp );
if ((bpp == 16) && (visual->red_mask != 0xf800)) bpp = 15; if ((bpp == 16) && (visual->red_mask != 0xf800)) bpp = 15;
if (bpp < 8) bpp = 8; if (bpp < 8) bpp = 8;

4
src/common/resource.cpp
View File

@ -53,6 +53,10 @@
#include "wx/intl.h" #include "wx/intl.h"
#endif #endif
#if wxUSE_RADIOBUTTON
#include "wx/radiobut.h"
#endif
#if wxUSE_SCROLLBAR #if wxUSE_SCROLLBAR
#include "wx/scrolbar.h" #include "wx/scrolbar.h"
#endif #endif

12
src/gtk/app.cpp
View File

@ -19,12 +19,12 @@
#include "wx/memory.h" #include "wx/memory.h"
#include "wx/font.h" #include "wx/font.h"
#include "wx/settings.h" #include "wx/settings.h"
#ifdef wxUSE_WX_RESOURCES #if wxUSE_WX_RESOURCES
#include "wx/resource.h" #include "wx/resource.h"
#endif #endif
#include "wx/module.h" #include "wx/module.h"
#include "wx/image.h" #include "wx/image.h"
#ifdef wxUSE_THREADS #if wxUSE_THREADS
#include "wx/thread.h" #include "wx/thread.h"
#endif #endif
#include "unistd.h" #include "unistd.h"
@ -146,11 +146,11 @@ END_EVENT_TABLE()
gint wxapp_idle_callback( gpointer WXUNUSED(data) ) gint wxapp_idle_callback( gpointer WXUNUSED(data) )
{ {
if (wxTheApp) while (wxTheApp->ProcessIdle()) {} if (wxTheApp) while (wxTheApp->ProcessIdle()) {}
#ifdef wxUSE_THREADS #if wxUSE_THREADS
wxMutexGuiLeave(); wxMutexGuiLeave();
#endif #endif
usleep(10000); usleep(10000);
#ifdef wxUSE_THREADS #if wxUSE_THREADS
wxMutexGuiEnter(); wxMutexGuiEnter();
#endif #endif
return TRUE; return TRUE;
@ -337,7 +337,7 @@ void wxApp::CommonInit(void)
wxInitializeStockLists(); wxInitializeStockLists();
wxInitializeStockObjects(); wxInitializeStockObjects();
#ifdef wxUSE_WX_RESOURCES #if wxUSE_WX_RESOURCES
wxTheResourceCache = new wxResourceCache(wxKEY_STRING); wxTheResourceCache = new wxResourceCache(wxKEY_STRING);
wxInitializeResourceSystem(); wxInitializeResourceSystem();
@ -354,7 +354,7 @@ void wxApp::CommonCleanUp(void)
wxDELETE(wxTheFontNameDirectory); wxDELETE(wxTheFontNameDirectory);
wxDeleteStockObjects(); wxDeleteStockObjects();
#ifdef wxUSE_WX_RESOURCES #if wxUSE_WX_RESOURCES
wxFlushResources(); wxFlushResources();
wxDELETE(wxTheResourceCache); wxDELETE(wxTheResourceCache);

2
src/gtk/clipbrd.cpp
View File

@ -13,7 +13,7 @@
#include "wx/clipbrd.h" #include "wx/clipbrd.h"
#ifdef wxUSE_CLIPBOARD #if wxUSE_CLIPBOARD
#include "glib.h" #include "glib.h"
#include "gdk/gdk.h" #include "gdk/gdk.h"

2
src/gtk/combobox.cpp
View File

@ -14,7 +14,7 @@
#include "wx/combobox.h" #include "wx/combobox.h"
#ifdef wxUSE_COMBOBOX #if wxUSE_COMBOBOX
#include <wx/intl.h> #include <wx/intl.h>

7
src/gtk/dcps.cpp
View File

@ -14,6 +14,11 @@
#pragma interface #pragma interface
#endif #endif
#include "wx/defs.h"
#if wxUSE_POSTSCRIPT
#include "wx/postscrp.h" #include "wx/postscrp.h"
#include "wx/dcmemory.h" #include "wx/dcmemory.h"
#include "wx/utils.h" #include "wx/utils.h"
@ -1665,3 +1670,5 @@ void wxPostScriptDC::GetSizeMM(long *width, long *height) const
} }
} }
#endif
// wxUSE_POSTSCRIPT

2
src/gtk/dnd.cpp
View File

@ -13,7 +13,7 @@
#include "wx/dnd.h" #include "wx/dnd.h"
#ifdef wxUSE_DRAG_AND_DROP #if wxUSE_DRAG_AND_DROP
#include "wx/window.h" #include "wx/window.h"
#include "wx/app.h" #include "wx/app.h"

8
src/gtk/listbox.cpp
View File

@ -18,6 +18,10 @@
#include "wx/intl.h" #include "wx/intl.h"
#include "wx/checklst.h" #include "wx/checklst.h"
#if wxUSE_DRAG_AND_DROP
#include "wx/dnd.h"
#endif
#include "gdk/gdk.h" #include "gdk/gdk.h"
#include "gtk/gtk.h" #include "gtk/gtk.h"
@ -319,7 +323,7 @@ void wxListBox::AppendCommon( const wxString &item )
ConnectWidget( list_item ); ConnectWidget( list_item );
#ifdef wxUSE_DRAG_AND_DROP #if wxUSE_DRAG_AND_DROP
#ifndef NEW_GTK_DND_CODE #ifndef NEW_GTK_DND_CODE
if (m_dropTarget) m_dropTarget->RegisterWidget( list_item ); if (m_dropTarget) m_dropTarget->RegisterWidget( list_item );
#endif #endif
@ -652,7 +656,7 @@ int wxListBox::GetIndex( GtkWidget *item ) const
return -1; return -1;
} }
#ifdef wxUSE_DRAG_AND_DROP #if wxUSE_DRAG_AND_DROP
void wxListBox::SetDropTarget( wxDropTarget *dropTarget ) void wxListBox::SetDropTarget( wxDropTarget *dropTarget )
{ {
wxCHECK_RET( m_list != NULL, "invalid listbox" ); wxCHECK_RET( m_list != NULL, "invalid listbox" );

3
src/gtk/menu.cpp
View File

@ -15,6 +15,7 @@
#include "wx/menu.h" #include "wx/menu.h"
#include "wx/log.h" #include "wx/log.h"
#include "wx/intl.h" #include "wx/intl.h"
#include "wx/app.h"
#include "gdk/gdk.h" #include "gdk/gdk.h"
#include "gtk/gtk.h" #include "gtk/gtk.h"
@ -160,6 +161,8 @@ bool wxMenuBar::Enabled( int id ) const
static void gtk_menu_clicked_callback( GtkWidget *widget, wxMenu *menu ) static void gtk_menu_clicked_callback( GtkWidget *widget, wxMenu *menu )
{ {
wxYield();
int id = menu->FindMenuIdByMenuItem(widget); int id = menu->FindMenuIdByMenuItem(widget);
/* should find it for normal (not popup) menu */ /* should find it for normal (not popup) menu */

14
src/gtk/threadpsx.cpp
View File

@ -322,7 +322,7 @@ void wxThread::Exit(void *status)
pthread_exit(status); pthread_exit(status);
} }
void wxThread::TestDestroy() bool wxThread::TestDestroy()
{ {
if (p_internal->state == STATE_PAUSING) if (p_internal->state == STATE_PAUSING)
{ {
@ -334,6 +334,8 @@ void wxThread::TestDestroy()
} }
} }
pthread_testcancel(); pthread_testcancel();
return TRUE; /* what is this for? */
} }
bool wxThread::IsMain() bool wxThread::IsMain()
@ -375,6 +377,16 @@ void wxThread::OnExit()
// wxThreadModule // wxThreadModule
//-------------------------------------------------------------------- //--------------------------------------------------------------------
class wxThreadModule : public wxModule
{
public:
virtual bool OnInit();
virtual void OnExit();
private:
DECLARE_DYNAMIC_CLASS(wxThreadModule)
};
IMPLEMENT_DYNAMIC_CLASS(wxThreadModule, wxModule) IMPLEMENT_DYNAMIC_CLASS(wxThreadModule, wxModule)
bool wxThreadModule::OnInit() bool wxThreadModule::OnInit()

10
src/gtk/threadsgi.cpp
View File

@ -239,6 +239,16 @@ void wxThread::OnExit()
// Global initialization // Global initialization
class wxThreadModule : public wxModule
{
public:
virtual bool OnInit();
virtual void OnExit();
private:
DECLARE_DYNAMIC_CLASS(wxThreadModule)
};
IMPLEMENT_DYNAMIC_CLASS(wxThreadModule, wxModule) IMPLEMENT_DYNAMIC_CLASS(wxThreadModule, wxModule)
bool wxThreadModule::OnInit() bool wxThreadModule::OnInit()

10
src/gtk/window.cpp
View File

@ -21,7 +21,7 @@
#include "wx/utils.h" #include "wx/utils.h"
#include "wx/dialog.h" #include "wx/dialog.h"
#include "wx/msgdlg.h" #include "wx/msgdlg.h"
#ifdef wxUSE_DRAG_AND_DROP #if wxUSE_DRAG_AND_DROP
#include "wx/dnd.h" #include "wx/dnd.h"
#endif #endif
#include "wx/menu.h" #include "wx/menu.h"
@ -1167,7 +1167,7 @@ wxWindow::wxWindow()
m_isShown = FALSE; m_isShown = FALSE;
m_isEnabled = TRUE; m_isEnabled = TRUE;
#ifdef wxUSE_DRAG_AND_DROP #if wxUSE_DRAG_AND_DROP
m_dropTarget = (wxDropTarget*) NULL; m_dropTarget = (wxDropTarget*) NULL;
#endif #endif
m_resizing = FALSE; m_resizing = FALSE;
@ -1335,7 +1335,7 @@ wxWindow::~wxWindow()
{ {
m_hasVMT = FALSE; m_hasVMT = FALSE;
#ifdef wxUSE_DRAG_AND_DROP #if wxUSE_DRAG_AND_DROP
if (m_dropTarget) delete m_dropTarget; if (m_dropTarget) delete m_dropTarget;
#endif #endif
@ -1456,7 +1456,7 @@ void wxWindow::PreCreation( wxWindow *parent, wxWindowID id,
m_isShown = FALSE; m_isShown = FALSE;
m_isEnabled = TRUE; m_isEnabled = TRUE;
#ifdef wxUSE_DRAG_AND_DROP #if wxUSE_DRAG_AND_DROP
m_dropTarget = (wxDropTarget *) NULL; m_dropTarget = (wxDropTarget *) NULL;
#endif #endif
m_resizing = FALSE; m_resizing = FALSE;
@ -2495,7 +2495,7 @@ bool wxWindow::PopupMenu( wxMenu *menu, int WXUNUSED(x), int WXUNUSED(y) )
return TRUE; return TRUE;
} }
#ifdef wxUSE_DRAG_AND_DROP #if wxUSE_DRAG_AND_DROP
void wxWindow::SetDropTarget( wxDropTarget *dropTarget ) void wxWindow::SetDropTarget( wxDropTarget *dropTarget )
{ {

12
src/gtk1/app.cpp
View File

@ -19,12 +19,12 @@
#include "wx/memory.h" #include "wx/memory.h"
#include "wx/font.h" #include "wx/font.h"
#include "wx/settings.h" #include "wx/settings.h"
#ifdef wxUSE_WX_RESOURCES #if wxUSE_WX_RESOURCES
#include "wx/resource.h" #include "wx/resource.h"
#endif #endif
#include "wx/module.h" #include "wx/module.h"
#include "wx/image.h" #include "wx/image.h"
#ifdef wxUSE_THREADS #if wxUSE_THREADS
#include "wx/thread.h" #include "wx/thread.h"
#endif #endif
#include "unistd.h" #include "unistd.h"
@ -146,11 +146,11 @@ END_EVENT_TABLE()
gint wxapp_idle_callback( gpointer WXUNUSED(data) ) gint wxapp_idle_callback( gpointer WXUNUSED(data) )
{ {
if (wxTheApp) while (wxTheApp->ProcessIdle()) {} if (wxTheApp) while (wxTheApp->ProcessIdle()) {}
#ifdef wxUSE_THREADS #if wxUSE_THREADS
wxMutexGuiLeave(); wxMutexGuiLeave();
#endif #endif
usleep(10000); usleep(10000);
#ifdef wxUSE_THREADS #if wxUSE_THREADS
wxMutexGuiEnter(); wxMutexGuiEnter();
#endif #endif
return TRUE; return TRUE;
@ -337,7 +337,7 @@ void wxApp::CommonInit(void)
wxInitializeStockLists(); wxInitializeStockLists();
wxInitializeStockObjects(); wxInitializeStockObjects();
#ifdef wxUSE_WX_RESOURCES #if wxUSE_WX_RESOURCES
wxTheResourceCache = new wxResourceCache(wxKEY_STRING); wxTheResourceCache = new wxResourceCache(wxKEY_STRING);
wxInitializeResourceSystem(); wxInitializeResourceSystem();
@ -354,7 +354,7 @@ void wxApp::CommonCleanUp(void)
wxDELETE(wxTheFontNameDirectory); wxDELETE(wxTheFontNameDirectory);
wxDeleteStockObjects(); wxDeleteStockObjects();
#ifdef wxUSE_WX_RESOURCES #if wxUSE_WX_RESOURCES
wxFlushResources(); wxFlushResources();
wxDELETE(wxTheResourceCache); wxDELETE(wxTheResourceCache);

2
src/gtk1/clipbrd.cpp
View File

@ -13,7 +13,7 @@
#include "wx/clipbrd.h" #include "wx/clipbrd.h"
#ifdef wxUSE_CLIPBOARD #if wxUSE_CLIPBOARD
#include "glib.h" #include "glib.h"
#include "gdk/gdk.h" #include "gdk/gdk.h"

2
src/gtk1/combobox.cpp
View File

@ -14,7 +14,7 @@
#include "wx/combobox.h" #include "wx/combobox.h"
#ifdef wxUSE_COMBOBOX #if wxUSE_COMBOBOX
#include <wx/intl.h> #include <wx/intl.h>

7
src/gtk1/dcps.cpp
View File

@ -14,6 +14,11 @@
#pragma interface #pragma interface
#endif #endif
#include "wx/defs.h"
#if wxUSE_POSTSCRIPT
#include "wx/postscrp.h" #include "wx/postscrp.h"
#include "wx/dcmemory.h" #include "wx/dcmemory.h"
#include "wx/utils.h" #include "wx/utils.h"
@ -1665,3 +1670,5 @@ void wxPostScriptDC::GetSizeMM(long *width, long *height) const
} }
} }
#endif
// wxUSE_POSTSCRIPT

2
src/gtk1/dnd.cpp
View File

@ -13,7 +13,7 @@
#include "wx/dnd.h" #include "wx/dnd.h"
#ifdef wxUSE_DRAG_AND_DROP #if wxUSE_DRAG_AND_DROP
#include "wx/window.h" #include "wx/window.h"
#include "wx/app.h" #include "wx/app.h"

8
src/gtk1/listbox.cpp
View File

@ -18,6 +18,10 @@
#include "wx/intl.h" #include "wx/intl.h"
#include "wx/checklst.h" #include "wx/checklst.h"
#if wxUSE_DRAG_AND_DROP
#include "wx/dnd.h"
#endif
#include "gdk/gdk.h" #include "gdk/gdk.h"
#include "gtk/gtk.h" #include "gtk/gtk.h"
@ -319,7 +323,7 @@ void wxListBox::AppendCommon( const wxString &item )
ConnectWidget( list_item ); ConnectWidget( list_item );
#ifdef wxUSE_DRAG_AND_DROP #if wxUSE_DRAG_AND_DROP
#ifndef NEW_GTK_DND_CODE #ifndef NEW_GTK_DND_CODE
if (m_dropTarget) m_dropTarget->RegisterWidget( list_item ); if (m_dropTarget) m_dropTarget->RegisterWidget( list_item );
#endif #endif
@ -652,7 +656,7 @@ int wxListBox::GetIndex( GtkWidget *item ) const
return -1; return -1;
} }
#ifdef wxUSE_DRAG_AND_DROP #if wxUSE_DRAG_AND_DROP
void wxListBox::SetDropTarget( wxDropTarget *dropTarget ) void wxListBox::SetDropTarget( wxDropTarget *dropTarget )
{ {
wxCHECK_RET( m_list != NULL, "invalid listbox" ); wxCHECK_RET( m_list != NULL, "invalid listbox" );

3
src/gtk1/menu.cpp
View File

@ -15,6 +15,7 @@
#include "wx/menu.h" #include "wx/menu.h"
#include "wx/log.h" #include "wx/log.h"
#include "wx/intl.h" #include "wx/intl.h"
#include "wx/app.h"
#include "gdk/gdk.h" #include "gdk/gdk.h"
#include "gtk/gtk.h" #include "gtk/gtk.h"
@ -160,6 +161,8 @@ bool wxMenuBar::Enabled( int id ) const
static void gtk_menu_clicked_callback( GtkWidget *widget, wxMenu *menu ) static void gtk_menu_clicked_callback( GtkWidget *widget, wxMenu *menu )
{ {
wxYield();
int id = menu->FindMenuIdByMenuItem(widget); int id = menu->FindMenuIdByMenuItem(widget);
/* should find it for normal (not popup) menu */ /* should find it for normal (not popup) menu */

14
src/gtk1/threadpsx.cpp
View File

@ -322,7 +322,7 @@ void wxThread::Exit(void *status)
pthread_exit(status); pthread_exit(status);
} }
void wxThread::TestDestroy() bool wxThread::TestDestroy()
{ {
if (p_internal->state == STATE_PAUSING) if (p_internal->state == STATE_PAUSING)
{ {
@ -334,6 +334,8 @@ void wxThread::TestDestroy()
} }
} }
pthread_testcancel(); pthread_testcancel();
return TRUE; /* what is this for? */
} }
bool wxThread::IsMain() bool wxThread::IsMain()
@ -375,6 +377,16 @@ void wxThread::OnExit()
// wxThreadModule // wxThreadModule
//-------------------------------------------------------------------- //--------------------------------------------------------------------
class wxThreadModule : public wxModule
{
public:
virtual bool OnInit();
virtual void OnExit();
private:
DECLARE_DYNAMIC_CLASS(wxThreadModule)
};
IMPLEMENT_DYNAMIC_CLASS(wxThreadModule, wxModule) IMPLEMENT_DYNAMIC_CLASS(wxThreadModule, wxModule)
bool wxThreadModule::OnInit() bool wxThreadModule::OnInit()

10
src/gtk1/threadsgi.cpp
View File

@ -239,6 +239,16 @@ void wxThread::OnExit()
// Global initialization // Global initialization
class wxThreadModule : public wxModule
{
public:
virtual bool OnInit();
virtual void OnExit();
private:
DECLARE_DYNAMIC_CLASS(wxThreadModule)
};
IMPLEMENT_DYNAMIC_CLASS(wxThreadModule, wxModule) IMPLEMENT_DYNAMIC_CLASS(wxThreadModule, wxModule)
bool wxThreadModule::OnInit() bool wxThreadModule::OnInit()

10
src/gtk1/window.cpp
View File

@ -21,7 +21,7 @@
#include "wx/utils.h" #include "wx/utils.h"
#include "wx/dialog.h" #include "wx/dialog.h"
#include "wx/msgdlg.h" #include "wx/msgdlg.h"
#ifdef wxUSE_DRAG_AND_DROP #if wxUSE_DRAG_AND_DROP
#include "wx/dnd.h" #include "wx/dnd.h"
#endif #endif
#include "wx/menu.h" #include "wx/menu.h"
@ -1167,7 +1167,7 @@ wxWindow::wxWindow()
m_isShown = FALSE; m_isShown = FALSE;
m_isEnabled = TRUE; m_isEnabled = TRUE;
#ifdef wxUSE_DRAG_AND_DROP #if wxUSE_DRAG_AND_DROP
m_dropTarget = (wxDropTarget*) NULL; m_dropTarget = (wxDropTarget*) NULL;
#endif #endif
m_resizing = FALSE; m_resizing = FALSE;
@ -1335,7 +1335,7 @@ wxWindow::~wxWindow()
{ {
m_hasVMT = FALSE; m_hasVMT = FALSE;
#ifdef wxUSE_DRAG_AND_DROP #if wxUSE_DRAG_AND_DROP
if (m_dropTarget) delete m_dropTarget; if (m_dropTarget) delete m_dropTarget;
#endif #endif
@ -1456,7 +1456,7 @@ void wxWindow::PreCreation( wxWindow *parent, wxWindowID id,
m_isShown = FALSE; m_isShown = FALSE;
m_isEnabled = TRUE; m_isEnabled = TRUE;
#ifdef wxUSE_DRAG_AND_DROP #if wxUSE_DRAG_AND_DROP
m_dropTarget = (wxDropTarget *) NULL; m_dropTarget = (wxDropTarget *) NULL;
#endif #endif
m_resizing = FALSE; m_resizing = FALSE;
@ -2495,7 +2495,7 @@ bool wxWindow::PopupMenu( wxMenu *menu, int WXUNUSED(x), int WXUNUSED(y) )
return TRUE; return TRUE;
} }
#ifdef wxUSE_DRAG_AND_DROP #if wxUSE_DRAG_AND_DROP
void wxWindow::SetDropTarget( wxDropTarget *dropTarget ) void wxWindow::SetDropTarget( wxDropTarget *dropTarget )
{ {

10
src/motif/thread.cpp
View File

@ -414,6 +414,16 @@ void wxThread::OnExit()
// wxThreadModule // wxThreadModule
//-------------------------------------------------------------------- //--------------------------------------------------------------------
class wxThreadModule : public wxModule
{
public:
virtual bool OnInit();
virtual void OnExit();
private:
DECLARE_DYNAMIC_CLASS(wxThreadModule)
};
IMPLEMENT_DYNAMIC_CLASS(wxThreadModule, wxModule) IMPLEMENT_DYNAMIC_CLASS(wxThreadModule, wxModule)
bool wxThreadModule::OnInit() bool wxThreadModule::OnInit()