Compile fixes,
Big-endian fix for image.cpp (Untested, I have no sparc) Make dist works (more or less) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3368 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -1181,7 +1181,8 @@ wxImage::wxImage( const wxBitmap &bitmap )
|
||||
{
|
||||
for (int i = 0; i < bitmap.GetWidth(); i++)
|
||||
{
|
||||
int pixel = gdk_image_get_pixel( gdk_image, i, j );
|
||||
wxInt32 pixel = gdk_image_get_pixel( gdk_image, i, j );
|
||||
pixel = wxINT32_SWAP_ON_BE( pixel );
|
||||
if (bpp <= 8)
|
||||
{
|
||||
data[pos] = cmap->colors[pixel].red >> 8;
|
||||
|
@@ -164,7 +164,7 @@ void yyerror(char *s)
|
||||
#ifndef yywrap
|
||||
#define yywrap() 1
|
||||
#endif
|
||||
#else if !defined(__alpha___) && !defined(__ultrix)
|
||||
#else if !defined(__alpha___) && !defined(__alpha) && !defined(__ultrix)
|
||||
int yywrap() { return 1; }
|
||||
#endif
|
||||
#elif defined(__WX_SETUP_H__)
|
||||
|
@@ -14,6 +14,7 @@
|
||||
#include "wx/font.h"
|
||||
#include "wx/utils.h"
|
||||
#include "wx/log.h"
|
||||
#include "wx/gdicmn.h"
|
||||
#include <strings.h>
|
||||
|
||||
#include "gdk/gdk.h"
|
||||
|
@@ -16,6 +16,7 @@
|
||||
#include "wx/string.h"
|
||||
#include "wx/list.h"
|
||||
#include "wx/log.h"
|
||||
#include "wx/gdicmn.h"
|
||||
|
||||
#include <ctype.h>
|
||||
#include <string.h>
|
||||
|
@@ -14,6 +14,7 @@
|
||||
#include "wx/font.h"
|
||||
#include "wx/utils.h"
|
||||
#include "wx/log.h"
|
||||
#include "wx/gdicmn.h"
|
||||
#include <strings.h>
|
||||
|
||||
#include "gdk/gdk.h"
|
||||
|
@@ -16,6 +16,7 @@
|
||||
#include "wx/string.h"
|
||||
#include "wx/list.h"
|
||||
#include "wx/log.h"
|
||||
#include "wx/gdicmn.h"
|
||||
|
||||
#include <ctype.h>
|
||||
#include <string.h>
|
||||
|
Reference in New Issue
Block a user