Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects 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
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"
#ifdef wxUSE_CLIPBOARD
#if wxUSE_CLIPBOARD
#include "wx/object.h"
#include "wx/list.h"

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

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

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

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

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

@@ -17,7 +17,7 @@
#include "wx/defs.h"
#ifdef wxUSE_DRAG_AND_DROP
#if wxUSE_DRAG_AND_DROP
#include "wx/object.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 SetStringSelection( const wxString &string, bool select = TRUE );
#ifdef wxUSE_DRAG_AND_DROP
#if wxUSE_DRAG_AND_DROP
void SetDropTarget( wxDropTarget *dropTarget );
#endif

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

@@ -42,11 +42,11 @@ class wxDC;
class wxClientData;
class wxVoidClientData;
class wxWindow;
#ifdef wxUSE_WX_RESOURCES
#if wxUSE_WX_RESOURCES
class wxResourceTable;
class wxItemResource;
#endif
#ifdef wxUSE_DRAG_AND_DROP
#if wxUSE_DRAG_AND_DROP
class wxDropTarget;
#endif
@@ -290,7 +290,7 @@ public:
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 wxDropTarget *GetDropTarget() const;
#endif
@@ -335,7 +335,7 @@ public:
int m_retCode;
wxEvtHandler *m_eventHandler;
wxValidator *m_windowValidator;
#ifdef wxUSE_DRAG_AND_DROP
#if wxUSE_DRAG_AND_DROP
wxDropTarget *m_dropTarget;
#endif
wxWindowID m_windowId;

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

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

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

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

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

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

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

@@ -17,7 +17,7 @@
#include "wx/defs.h"
#ifdef wxUSE_DRAG_AND_DROP
#if wxUSE_DRAG_AND_DROP
#include "wx/object.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 SetStringSelection( const wxString &string, bool select = TRUE );
#ifdef wxUSE_DRAG_AND_DROP
#if wxUSE_DRAG_AND_DROP
void SetDropTarget( wxDropTarget *dropTarget );
#endif

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

@@ -42,11 +42,11 @@ class wxDC;
class wxClientData;
class wxVoidClientData;
class wxWindow;
#ifdef wxUSE_WX_RESOURCES
#if wxUSE_WX_RESOURCES
class wxResourceTable;
class wxItemResource;
#endif
#ifdef wxUSE_DRAG_AND_DROP
#if wxUSE_DRAG_AND_DROP
class wxDropTarget;
#endif
@@ -290,7 +290,7 @@ public:
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 wxDropTarget *GetDropTarget() const;
#endif
@@ -335,7 +335,7 @@ public:
int m_retCode;
wxEvtHandler *m_eventHandler;
wxValidator *m_windowValidator;
#ifdef wxUSE_DRAG_AND_DROP
#if wxUSE_DRAG_AND_DROP
wxDropTarget *m_dropTarget;
#endif
wxWindowID m_windowId;

11
include/wx/odbc.h
View File

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

4
include/wx/thread.h
View File

@@ -106,6 +106,8 @@ private:
wxMutex *m_mutex;
};
#ifdef __WXMSW__
// ----------------------------------------------------------------------------
// 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
@@ -146,6 +148,8 @@ private:
wxCriticalSection *m_critsect;
};
#endif
// ----------------------------------------------------------------------------
// Condition handler.
// ----------------------------------------------------------------------------