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

19
src/common/image.cpp
View File

@@ -722,13 +722,13 @@ bool wxBMPHandler::LoadFile( wxImage *image, const wxString& name )
int height = (int)dbuf[1];
if (width > 32767)
{
fprintf(stderr, "IMLIB ERROR: Image width > 32767 pixels for file\n");
wxLogError( "Image width > 32767 pixels for file\n" );
fclose(file);
return FALSE;
}
if (height > 32767)
{
fprintf(stderr, "IMLIB ERROR: Image height > 32767 pixels for file\n");
wxLogError( "Image height > 32767 pixels for file\n" );
fclose(file);
return FALSE;
}
@@ -738,7 +738,7 @@ bool wxBMPHandler::LoadFile( wxImage *image, const wxString& name )
bpp = (int)word;
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);
return FALSE;
}
@@ -746,7 +746,7 @@ bool wxBMPHandler::LoadFile( wxImage *image, const wxString& name )
comp = (int)dbuf[0];
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);
return FALSE;
}
@@ -757,7 +757,7 @@ bool wxBMPHandler::LoadFile( wxImage *image, const wxString& name )
/* some more sanity checks */
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);
return FALSE;
}
@@ -767,7 +767,7 @@ bool wxBMPHandler::LoadFile( wxImage *image, const wxString& name )
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);
return FALSE;
}
@@ -779,7 +779,7 @@ bool wxBMPHandler::LoadFile( wxImage *image, const wxString& name )
ptr = image->GetData();
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);
if (cmap)
free(cmap);
@@ -894,7 +894,7 @@ bool wxBMPHandler::LoadFile( wxImage *image, const wxString& name )
{
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();
free(cmap);
return FALSE;
@@ -1296,6 +1296,9 @@ wxBitmap wxImage::ConvertToBitmap() const
GdkVisual *visual = gdk_window_get_visual( bitmap.GetPixmap() );
if (visual == NULL) visual = gdk_window_get_visual( (GdkWindow*) &gdk_root_parent );
int bpp = visual->depth;
bitmap.SetDepth( bpp );
if ((bpp == 16) && (visual->red_mask != 0xf800)) bpp = 15;
if (bpp < 8) bpp = 8;

4
src/common/resource.cpp
View File

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

12
src/gtk/app.cpp
View File

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

2
src/gtk/clipbrd.cpp
View File

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

2
src/gtk/combobox.cpp
View File

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

7
src/gtk/dcps.cpp
View File

@@ -14,6 +14,11 @@
#pragma interface
#endif
#include "wx/defs.h"
#if wxUSE_POSTSCRIPT
#include "wx/postscrp.h"
#include "wx/dcmemory.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"
#ifdef wxUSE_DRAG_AND_DROP
#if wxUSE_DRAG_AND_DROP
#include "wx/window.h"
#include "wx/app.h"

8
src/gtk/listbox.cpp
View File

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

3
src/gtk/menu.cpp
View File

@@ -15,6 +15,7 @@
#include "wx/menu.h"
#include "wx/log.h"
#include "wx/intl.h"
#include "wx/app.h"
#include "gdk/gdk.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 )
{
wxYield();
int id = menu->FindMenuIdByMenuItem(widget);
/* 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);
}
void wxThread::TestDestroy()
bool wxThread::TestDestroy()
{
if (p_internal->state == STATE_PAUSING)
{
@@ -334,6 +334,8 @@ void wxThread::TestDestroy()
}
}
pthread_testcancel();
return TRUE; /* what is this for? */
}
bool wxThread::IsMain()
@@ -375,6 +377,16 @@ void wxThread::OnExit()
// wxThreadModule
//--------------------------------------------------------------------
class wxThreadModule : public wxModule
{
public:
virtual bool OnInit();
virtual void OnExit();
private:
DECLARE_DYNAMIC_CLASS(wxThreadModule)
};
IMPLEMENT_DYNAMIC_CLASS(wxThreadModule, wxModule)
bool wxThreadModule::OnInit()

10
src/gtk/threadsgi.cpp
View File

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

10
src/gtk/window.cpp
View File

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

12
src/gtk1/app.cpp
View File

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

2
src/gtk1/clipbrd.cpp
View File

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

2
src/gtk1/combobox.cpp
View File

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

7
src/gtk1/dcps.cpp
View File

@@ -14,6 +14,11 @@
#pragma interface
#endif
#include "wx/defs.h"
#if wxUSE_POSTSCRIPT
#include "wx/postscrp.h"
#include "wx/dcmemory.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"
#ifdef wxUSE_DRAG_AND_DROP
#if wxUSE_DRAG_AND_DROP
#include "wx/window.h"
#include "wx/app.h"

8
src/gtk1/listbox.cpp
View File

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

3
src/gtk1/menu.cpp
View File

@@ -15,6 +15,7 @@
#include "wx/menu.h"
#include "wx/log.h"
#include "wx/intl.h"
#include "wx/app.h"
#include "gdk/gdk.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 )
{
wxYield();
int id = menu->FindMenuIdByMenuItem(widget);
/* 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);
}
void wxThread::TestDestroy()
bool wxThread::TestDestroy()
{
if (p_internal->state == STATE_PAUSING)
{
@@ -334,6 +334,8 @@ void wxThread::TestDestroy()
}
}
pthread_testcancel();
return TRUE; /* what is this for? */
}
bool wxThread::IsMain()
@@ -375,6 +377,16 @@ void wxThread::OnExit()
// wxThreadModule
//--------------------------------------------------------------------
class wxThreadModule : public wxModule
{
public:
virtual bool OnInit();
virtual void OnExit();
private:
DECLARE_DYNAMIC_CLASS(wxThreadModule)
};
IMPLEMENT_DYNAMIC_CLASS(wxThreadModule, wxModule)
bool wxThreadModule::OnInit()

10
src/gtk1/threadsgi.cpp
View File

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

10
src/gtk1/window.cpp
View File

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

10
src/motif/thread.cpp
View File

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