Removed warnings mesgs
Doesn't compile due to missing bufstream git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@373 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -57,10 +57,10 @@ LIB_CPP_SRC=\
|
||||
common/timercmn.cpp \
|
||||
common/utilscmn.cpp \
|
||||
common/stream.cpp \
|
||||
common/datstrm.cpp \
|
||||
common/fstream.cpp \
|
||||
common/mstream.cpp \
|
||||
common/zstream.cpp \
|
||||
common/datstrm.cpp \
|
||||
common/objstrm.cpp \
|
||||
\
|
||||
gtk/app.cpp \
|
||||
|
@@ -387,7 +387,9 @@ int wxMemStruct::ValidateNode ()
|
||||
ErrorMsg ("Object already deleted");
|
||||
else {
|
||||
// Can't use the error routines as we have no recognisable object.
|
||||
// wxTrace("Can't verify memory struct - all bets are off!\n");
|
||||
#ifndef __WXGTK__
|
||||
wxTrace("Can't verify memory struct - all bets are off!\n");
|
||||
#endif
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
@@ -627,7 +629,7 @@ bool wxDebugContext::PrintList (void)
|
||||
if (!HasStream())
|
||||
return FALSE;
|
||||
|
||||
TraverseList ((PmSFV)&wxMemStruct::PrintNode, (checkPoint ? checkPoint->m_next : NULL));
|
||||
TraverseList ((PmSFV)&wxMemStruct::PrintNode, (checkPoint ? checkPoint->m_next : (wxMemStruct*)NULL));
|
||||
|
||||
return TRUE;
|
||||
#else
|
||||
@@ -649,10 +651,10 @@ bool wxDebugContext::Dump(void)
|
||||
{
|
||||
appNameStr = wxTheApp->GetAppName();
|
||||
appName = (char*) (const char*) appNameStr;
|
||||
wxTrace("Memory dump of %s at %s:\n", appName, wxNow());
|
||||
wxTrace("Memory dump of %s at %s:\n", appName, WXSTRINGCAST wxNow() );
|
||||
}
|
||||
}
|
||||
TraverseList ((PmSFV)&wxMemStruct::Dump, (checkPoint ? checkPoint->m_next : NULL));
|
||||
TraverseList ((PmSFV)&wxMemStruct::Dump, (checkPoint ? checkPoint->m_next : (wxMemStruct*)NULL));
|
||||
|
||||
return TRUE;
|
||||
#else
|
||||
@@ -700,7 +702,7 @@ bool wxDebugContext::PrintStatistics(bool detailed)
|
||||
|
||||
wxDebugStatsStruct *list = NULL;
|
||||
|
||||
wxMemStruct *from = (checkPoint ? checkPoint->m_next : NULL);
|
||||
wxMemStruct *from = (checkPoint ? checkPoint->m_next : (wxMemStruct*)NULL );
|
||||
if (!from)
|
||||
from = wxDebugContext::GetHead ();
|
||||
|
||||
@@ -819,7 +821,7 @@ int wxDebugContext::Check(bool checkAll)
|
||||
{
|
||||
int nFailures = 0;
|
||||
|
||||
wxMemStruct *from = (checkPoint ? checkPoint->m_next : NULL);
|
||||
wxMemStruct *from = (checkPoint ? checkPoint->m_next : (wxMemStruct*)NULL );
|
||||
if (!from || checkAll)
|
||||
from = wxDebugContext::GetHead ();
|
||||
|
||||
@@ -918,7 +920,7 @@ void operator delete[] (void * buf)
|
||||
#endif
|
||||
|
||||
// TODO: store whether this is a vector or not.
|
||||
void * wxDebugAlloc(size_t size, char * fileName, int lineNum, bool isObject, bool isVect)
|
||||
void * wxDebugAlloc(size_t size, char * fileName, int lineNum, bool isObject, bool WXUNUSED(isVect) )
|
||||
{
|
||||
// If not in debugging allocation mode, do the normal thing
|
||||
// so we don't leave any trace of ourselves in the node list.
|
||||
@@ -969,7 +971,7 @@ void * wxDebugAlloc(size_t size, char * fileName, int lineNum, bool isObject, bo
|
||||
}
|
||||
|
||||
// TODO: check whether was allocated as a vector
|
||||
void wxDebugFree(void * buf, bool isVect)
|
||||
void wxDebugFree(void * buf, bool WXUNUSED(isVect) )
|
||||
{
|
||||
if (!buf)
|
||||
return;
|
||||
|
@@ -159,7 +159,7 @@ bool wxObjectInputStream::ReadObjectDef(wxObjectStreamInfo *info)
|
||||
sig[WXOBJ_BEG_LEN] = 0;
|
||||
if (wxString(sig) != WXOBJ_BEGIN)
|
||||
return FALSE;
|
||||
info->object = wxCreateDynamicObject((char *)data_s.ReadString());
|
||||
info->object = wxCreateDynamicObject( WXSTRINGCAST data_s.ReadString());
|
||||
info->object_name = data_s.ReadString();
|
||||
info->n_children = data_s.Read8();
|
||||
info->children = wxList();
|
||||
|
@@ -483,7 +483,7 @@ g_LoadXPM(char *f, int *w, int *h, int *t)
|
||||
FILE *file;
|
||||
unsigned char *data, *ptr;
|
||||
int pc, c, i, j, k, ncolors, cpp, comment, transp, quote,
|
||||
context, len, token, done;
|
||||
context, len, /*token,*/ done;
|
||||
char line[65536], s[65536], tok[65536], col[65536];
|
||||
XColor xcol;
|
||||
struct _cmap
|
||||
@@ -495,8 +495,12 @@ g_LoadXPM(char *f, int *w, int *h, int *t)
|
||||
*cmap;
|
||||
int lookup[128][128];
|
||||
|
||||
i = 0;
|
||||
j = 0;
|
||||
|
||||
transp = 0;
|
||||
done = 0;
|
||||
cmap = NULL;
|
||||
|
||||
file = fopen(f, "r");
|
||||
if (!file)
|
||||
@@ -574,7 +578,7 @@ g_LoadXPM(char *f, int *w, int *h, int *t)
|
||||
/* Color Table */
|
||||
if (j < ncolors)
|
||||
{
|
||||
int colptr = 0;
|
||||
/* int colptr = 0; not used */
|
||||
int slen;
|
||||
|
||||
tok[0] = 0;
|
||||
@@ -645,10 +649,10 @@ g_LoadXPM(char *f, int *w, int *h, int *t)
|
||||
{
|
||||
if (cpp == 1)
|
||||
for (i = 0; i < ncolors; i++)
|
||||
lookup[cmap[i].str[0]][cmap[i].str[1]] = i;
|
||||
lookup[(int)cmap[i].str[0]][(int)cmap[i].str[1]] = i;
|
||||
if (cpp == 2)
|
||||
for (i = 0; i < ncolors; i++)
|
||||
lookup[cmap[i].str[0]][cmap[i].str[1]] = i;
|
||||
lookup[(int)cmap[i].str[0]][(int)cmap[i].str[1]] = i;
|
||||
context++;
|
||||
}
|
||||
}
|
||||
@@ -667,7 +671,7 @@ g_LoadXPM(char *f, int *w, int *h, int *t)
|
||||
for (i = 0; ((i < 65536) && (line[i])); i++)
|
||||
{
|
||||
col[0] = line[i];
|
||||
if (cmap[lookup[col[0]][0]].transp)
|
||||
if (cmap[lookup[(int)col[0]][0]].transp)
|
||||
{
|
||||
*ptr++ = 255;
|
||||
*ptr++ = 0;
|
||||
@@ -675,9 +679,9 @@ g_LoadXPM(char *f, int *w, int *h, int *t)
|
||||
}
|
||||
else
|
||||
{
|
||||
*ptr++ = (unsigned char)cmap[lookup[col[0]][0]].r;
|
||||
*ptr++ = (unsigned char)cmap[lookup[col[0]][0]].g;
|
||||
*ptr++ = (unsigned char)cmap[lookup[col[0]][0]].b;
|
||||
*ptr++ = (unsigned char)cmap[lookup[(int)col[0]][0]].r;
|
||||
*ptr++ = (unsigned char)cmap[lookup[(int)col[0]][0]].g;
|
||||
*ptr++ = (unsigned char)cmap[lookup[(int)col[0]][0]].b;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -686,9 +690,9 @@ g_LoadXPM(char *f, int *w, int *h, int *t)
|
||||
for (i = 0; ((i < 65536) && (line[i])); i++)
|
||||
{
|
||||
col[0] = line[i];
|
||||
*ptr++ = (unsigned char)cmap[lookup[col[0]][0]].r;
|
||||
*ptr++ = (unsigned char)cmap[lookup[col[0]][0]].g;
|
||||
*ptr++ = (unsigned char)cmap[lookup[col[0]][0]].b;
|
||||
*ptr++ = (unsigned char)cmap[lookup[(int)col[0]][0]].r;
|
||||
*ptr++ = (unsigned char)cmap[lookup[(int)col[0]][0]].g;
|
||||
*ptr++ = (unsigned char)cmap[lookup[(int)col[0]][0]].b;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -700,7 +704,7 @@ g_LoadXPM(char *f, int *w, int *h, int *t)
|
||||
{
|
||||
col[0] = line[i++];
|
||||
col[1] = line[i];
|
||||
if (cmap[lookup[col[0]][col[1]]].transp)
|
||||
if (cmap[lookup[(int)col[0]][(int)col[1]]].transp)
|
||||
{
|
||||
*ptr++ = 255;
|
||||
*ptr++ = 0;
|
||||
@@ -708,9 +712,9 @@ g_LoadXPM(char *f, int *w, int *h, int *t)
|
||||
}
|
||||
else
|
||||
{
|
||||
*ptr++ = (unsigned char)cmap[lookup[col[0]][col[1]]].r;
|
||||
*ptr++ = (unsigned char)cmap[lookup[col[0]][col[1]]].g;
|
||||
*ptr++ = (unsigned char)cmap[lookup[col[0]][col[1]]].b;
|
||||
*ptr++ = (unsigned char)cmap[lookup[(int)col[0]][(int)col[1]]].r;
|
||||
*ptr++ = (unsigned char)cmap[lookup[(int)col[0]][(int)col[1]]].g;
|
||||
*ptr++ = (unsigned char)cmap[lookup[(int)col[0]][(int)col[1]]].b;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -720,9 +724,9 @@ g_LoadXPM(char *f, int *w, int *h, int *t)
|
||||
{
|
||||
col[0] = line[i++];
|
||||
col[1] = line[i];
|
||||
*ptr++ = (unsigned char)cmap[lookup[col[0]][col[1]]].r;
|
||||
*ptr++ = (unsigned char)cmap[lookup[col[0]][col[1]]].g;
|
||||
*ptr++ = (unsigned char)cmap[lookup[col[0]][col[1]]].b;
|
||||
*ptr++ = (unsigned char)cmap[lookup[(int)col[0]][(int)col[1]]].r;
|
||||
*ptr++ = (unsigned char)cmap[lookup[(int)col[0]][(int)col[1]]].g;
|
||||
*ptr++ = (unsigned char)cmap[lookup[(int)col[0]][(int)col[1]]].b;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@@ -524,7 +524,7 @@ gdk_imlib_init_params(GdkImlibInitParams * p)
|
||||
XWindowAttributes xwa;
|
||||
XVisualInfo xvi, *xvir;
|
||||
char *homedir;
|
||||
char file[4096];
|
||||
/* char file[4096]; */
|
||||
char s[4096], *s1, *s2;
|
||||
FILE *f;
|
||||
int override = 0;
|
||||
@@ -533,7 +533,7 @@ gdk_imlib_init_params(GdkImlibInitParams * p)
|
||||
int num;
|
||||
int i, max, maxn;
|
||||
int clas;
|
||||
char *palfile;
|
||||
char *palfile = NULL;
|
||||
int loadpal;
|
||||
int vis;
|
||||
int newcm;
|
||||
|
@@ -204,7 +204,7 @@ grender_shaped_15_fast_dither_ordered(GdkImlibImage * im, int w, int h, XImage *
|
||||
XImage * sxim, int *er1, int *er2, int *xarray,
|
||||
unsigned char **yarray)
|
||||
{
|
||||
int x, y, val, r, g, b, *ter, ex, er, eg, eb;
|
||||
int x, y, val, r, g, b, /* *ter, ex,*/ er, eg, eb;
|
||||
unsigned char *ptr2;
|
||||
unsigned short *img;
|
||||
int jmp;
|
||||
@@ -262,7 +262,7 @@ grender_15_fast_dither(GdkImlibImage * im, int w, int h, XImage * xim,
|
||||
XImage * sxim, int *er1, int *er2, int *xarray,
|
||||
unsigned char **yarray)
|
||||
{
|
||||
int x, y, val, r, g, b, *ter, ex, er, eg, eb;
|
||||
int x, y, val, r, g, b, *ter, ex, er, eg, eb;
|
||||
unsigned char *ptr2;
|
||||
unsigned short *img;
|
||||
int jmp;
|
||||
@@ -308,7 +308,7 @@ grender_15_fast_dither_ordered(GdkImlibImage * im, int w, int h, XImage * xim,
|
||||
XImage * sxim, int *er1, int *er2, int *xarray,
|
||||
unsigned char **yarray)
|
||||
{
|
||||
int x, y, val, r, g, b, *ter, ex, er, eg, eb;
|
||||
int x, y, val, r, g, b, /* *ter, ex,*/ er, eg, eb;
|
||||
unsigned char *ptr2;
|
||||
|
||||
unsigned short *img;
|
||||
@@ -414,7 +414,7 @@ grender_shaped_16_fast_dither_ordered(GdkImlibImage * im, int w, int h, XImage *
|
||||
XImage * sxim, int *er1, int *er2, int *xarray,
|
||||
unsigned char **yarray)
|
||||
{
|
||||
int x, y, val, r, g, b, *ter, ex, er, eg, eb;
|
||||
int x, y, val, r, g, b, /* *ter, ex,*/ er, eg, eb;
|
||||
unsigned char *ptr2;
|
||||
unsigned short *img;
|
||||
int jmp;
|
||||
@@ -519,7 +519,7 @@ grender_16_fast_dither_ordered(GdkImlibImage * im, int w, int h, XImage * xim,
|
||||
XImage * sxim, int *er1, int *er2, int *xarray,
|
||||
unsigned char **yarray)
|
||||
{
|
||||
int x, y, val, r, g, b, *ter, ex, er, eg, eb;
|
||||
int x, y, val, r, g, b, /* *ter, ex, */ er, eg, eb;
|
||||
unsigned char *ptr2;
|
||||
|
||||
unsigned short *img;
|
||||
@@ -635,7 +635,7 @@ grender_shaped_15_dither_ordered(GdkImlibImage * im, int w, int h, XImage * xim,
|
||||
XImage * sxim, int *er1, int *er2, int *xarray,
|
||||
unsigned char **yarray)
|
||||
{
|
||||
int x, y, val, r, g, b, *ter, ex, er, eg, eb;
|
||||
int x, y, val, r, g, b, /* *ter, ex,*/ er, eg, eb;
|
||||
unsigned char *ptr2;
|
||||
|
||||
unsigned char dither[4][4] =
|
||||
@@ -728,7 +728,7 @@ grender_15_dither_ordered(GdkImlibImage * im, int w, int h, XImage * xim,
|
||||
XImage * sxim, int *er1, int *er2, int *xarray,
|
||||
unsigned char **yarray)
|
||||
{
|
||||
int x, y, val, r, g, b, *ter, ex, er, eg, eb;
|
||||
int x, y, val, r, g, b, /* *ter, ex, */ er, eg, eb;
|
||||
unsigned char *ptr2;
|
||||
|
||||
unsigned char dither[4][4] =
|
||||
@@ -822,7 +822,7 @@ grender_shaped_16_dither_ordered(GdkImlibImage * im, int w, int h, XImage * xim,
|
||||
XImage * sxim, int *er1, int *er2, int *xarray,
|
||||
unsigned char **yarray)
|
||||
{
|
||||
int x, y, val, r, g, b, *ter, ex, er, eg, eb;
|
||||
int x, y, val, r, g, b, /* *ter, ex, */ er, eg, eb;
|
||||
unsigned char *ptr2;
|
||||
|
||||
unsigned char dither[4][4] =
|
||||
@@ -915,7 +915,7 @@ grender_16_dither_ordered(GdkImlibImage * im, int w, int h, XImage * xim,
|
||||
XImage * sxim, int *er1, int *er2, int *xarray,
|
||||
unsigned char **yarray)
|
||||
{
|
||||
int x, y, val, r, g, b, *ter, ex, er, eg, eb;
|
||||
int x, y, val, r, g, b, /* *ter, ex,*/ er, eg, eb;
|
||||
unsigned char *ptr2;
|
||||
|
||||
unsigned char dither[4][4] =
|
||||
@@ -2816,7 +2816,7 @@ grender_shaped_15_fast_dither_mod_ordered(GdkImlibImage * im, int w, int h, XIma
|
||||
XImage * sxim, int *er1, int *er2, int *xarray,
|
||||
unsigned char **yarray)
|
||||
{
|
||||
int x, y, val, r, g, b, *ter, ex, er, eg, eb;
|
||||
int x, y, val, r, g, b, /* *ter, ex,*/ er, eg, eb;
|
||||
unsigned char *ptr2;
|
||||
unsigned short *img;
|
||||
int jmp;
|
||||
@@ -2926,7 +2926,7 @@ grender_15_fast_dither_mod_ordered(GdkImlibImage * im, int w, int h, XImage * xi
|
||||
XImage * sxim, int *er1, int *er2, int *xarray,
|
||||
unsigned char **yarray)
|
||||
{
|
||||
int x, y, val, r, g, b, *ter, ex, er, eg, eb;
|
||||
int x, y, val, r, g, b, /* *ter, ex,*/ er, eg, eb;
|
||||
unsigned char *ptr2;
|
||||
|
||||
unsigned short *img;
|
||||
@@ -3038,7 +3038,7 @@ grender_shaped_16_fast_dither_mod_ordered(GdkImlibImage * im, int w, int h, XIma
|
||||
XImage * sxim, int *er1, int *er2, int *xarray,
|
||||
unsigned char **yarray)
|
||||
{
|
||||
int x, y, val, r, g, b, *ter, ex, er, eg, eb;
|
||||
int x, y, val, r, g, b, /* *ter, ex,*/ er, eg, eb;
|
||||
unsigned char *ptr2;
|
||||
unsigned short *img;
|
||||
int jmp;
|
||||
@@ -3149,7 +3149,7 @@ grender_16_fast_dither_mod_ordered(GdkImlibImage * im, int w, int h, XImage * xi
|
||||
XImage * sxim, int *er1, int *er2, int *xarray,
|
||||
unsigned char **yarray)
|
||||
{
|
||||
int x, y, val, r, g, b, *ter, ex, er, eg, eb;
|
||||
int x, y, val, r, g, b, /* *ter, ex,*/ er, eg, eb;
|
||||
unsigned char *ptr2;
|
||||
|
||||
unsigned short *img;
|
||||
@@ -3200,7 +3200,7 @@ grender_shaped_15_dither_mod_ordered(GdkImlibImage * im, int w, int h, XImage *
|
||||
XImage * sxim, int *er1, int *er2, int *xarray,
|
||||
unsigned char **yarray)
|
||||
{
|
||||
int x, y, val, r, g, b, *ter, ex, er, eg, eb;
|
||||
int x, y, val, r, g, b, /* *ter, ex, */ er, eg, eb;
|
||||
unsigned char *ptr2;
|
||||
|
||||
unsigned char dither[4][4] =
|
||||
@@ -3255,7 +3255,7 @@ grender_15_dither_mod_ordered(GdkImlibImage * im, int w, int h, XImage * xim,
|
||||
XImage * sxim, int *er1, int *er2, int *xarray,
|
||||
unsigned char **yarray)
|
||||
{
|
||||
int x, y, val, r, g, b, *ter, ex, er, eg, eb;
|
||||
int x, y, val, r, g, b, /* *ter, ex, */ er, eg, eb;
|
||||
unsigned char *ptr2;
|
||||
|
||||
unsigned char dither[4][4] =
|
||||
@@ -3300,7 +3300,7 @@ grender_shaped_16_dither_mod_ordered(GdkImlibImage * im, int w, int h, XImage *
|
||||
XImage * sxim, int *er1, int *er2, int *xarray,
|
||||
unsigned char **yarray)
|
||||
{
|
||||
int x, y, val, r, g, b, *ter, ex, er, eg, eb;
|
||||
int x, y, val, r, g, b, /* *ter, ex,*/ er, eg, eb;
|
||||
unsigned char *ptr2;
|
||||
|
||||
unsigned char dither[4][4] =
|
||||
@@ -3355,7 +3355,7 @@ grender_16_dither_mod_ordered(GdkImlibImage * im, int w, int h, XImage * xim,
|
||||
XImage * sxim, int *er1, int *er2, int *xarray,
|
||||
unsigned char **yarray)
|
||||
{
|
||||
int x, y, val, r, g, b, *ter, ex, er, eg, eb;
|
||||
int x, y, val, r, g, b, /* *ter, ex, */ er, eg, eb;
|
||||
unsigned char *ptr2;
|
||||
|
||||
unsigned char dither[4][4] =
|
||||
|
@@ -83,7 +83,7 @@ gdk_imlib_save_image(GdkImlibImage * im, char *file, GdkImlibSaveInfo * info)
|
||||
{
|
||||
int bx, by, bxx, byy;
|
||||
int w, h;
|
||||
int sx, sy;
|
||||
int sx = 0, sy = 0;
|
||||
int tx = 35, ty = 35;
|
||||
int x, y;
|
||||
unsigned char *ptr;
|
||||
|
@@ -935,7 +935,7 @@ gdk_imlib_create_image_from_xpm_data(char **data)
|
||||
{
|
||||
GdkImlibImage *im;
|
||||
unsigned char *ptr;
|
||||
int pc, c, i, j, k, ncolors, cpp, comment, transp, quote,
|
||||
int /* pc, */ c, i, j, k, ncolors, cpp, comment, transp, quote,
|
||||
context, len, count, done;
|
||||
int w, h;
|
||||
char *line, s[65536], tok[65536], col[65536];
|
||||
@@ -947,8 +947,11 @@ gdk_imlib_create_image_from_xpm_data(char **data)
|
||||
int r, g, b;
|
||||
}
|
||||
*cmap;
|
||||
|
||||
int lookup[128][128];
|
||||
|
||||
cmap = NULL;
|
||||
j = 0;
|
||||
if (!data)
|
||||
return NULL;
|
||||
im = malloc(sizeof(GdkImlibImage));
|
||||
@@ -1133,10 +1136,10 @@ gdk_imlib_create_image_from_xpm_data(char **data)
|
||||
{
|
||||
if (cpp == 1)
|
||||
for (i = 0; i < ncolors; i++)
|
||||
lookup[cmap[i].str[0]][cmap[i].str[1]] = i;
|
||||
lookup[(int)cmap[i].str[0]][(int)cmap[i].str[1]] = i;
|
||||
if (cpp == 2)
|
||||
for (i = 0; i < ncolors; i++)
|
||||
lookup[cmap[i].str[0]][cmap[i].str[1]] = i;
|
||||
lookup[(int)cmap[i].str[0]][(int)cmap[i].str[1]] = i;
|
||||
context++;
|
||||
}
|
||||
}
|
||||
@@ -1154,7 +1157,7 @@ gdk_imlib_create_image_from_xpm_data(char **data)
|
||||
for (i = 0; ((i < 65536) && (line[i])); i++)
|
||||
{
|
||||
col[0] = line[i];
|
||||
if (cmap[lookup[col[0]][0]].transp)
|
||||
if (cmap[lookup[(int)col[0]][0]].transp)
|
||||
{
|
||||
*ptr++ = 255;
|
||||
*ptr++ = 0;
|
||||
@@ -1162,9 +1165,9 @@ gdk_imlib_create_image_from_xpm_data(char **data)
|
||||
}
|
||||
else
|
||||
{
|
||||
*ptr++ = (unsigned char)cmap[lookup[col[0]][0]].r;
|
||||
*ptr++ = (unsigned char)cmap[lookup[col[0]][0]].g;
|
||||
*ptr++ = (unsigned char)cmap[lookup[col[0]][0]].b;
|
||||
*ptr++ = (unsigned char)cmap[lookup[(int)col[0]][0]].r;
|
||||
*ptr++ = (unsigned char)cmap[lookup[(int)col[0]][0]].g;
|
||||
*ptr++ = (unsigned char)cmap[lookup[(int)col[0]][0]].b;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1173,9 +1176,9 @@ gdk_imlib_create_image_from_xpm_data(char **data)
|
||||
for (i = 0; ((i < 65536) && (line[i])); i++)
|
||||
{
|
||||
col[0] = line[i];
|
||||
*ptr++ = (unsigned char)cmap[lookup[col[0]][0]].r;
|
||||
*ptr++ = (unsigned char)cmap[lookup[col[0]][0]].g;
|
||||
*ptr++ = (unsigned char)cmap[lookup[col[0]][0]].b;
|
||||
*ptr++ = (unsigned char)cmap[lookup[(int)col[0]][0]].r;
|
||||
*ptr++ = (unsigned char)cmap[lookup[(int)col[0]][0]].g;
|
||||
*ptr++ = (unsigned char)cmap[lookup[(int)col[0]][0]].b;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1187,7 +1190,7 @@ gdk_imlib_create_image_from_xpm_data(char **data)
|
||||
{
|
||||
col[0] = line[i++];
|
||||
col[1] = line[i];
|
||||
if (cmap[lookup[col[0]][col[1]]].transp)
|
||||
if (cmap[lookup[(int)col[0]][(int)col[1]]].transp)
|
||||
{
|
||||
*ptr++ = 255;
|
||||
*ptr++ = 0;
|
||||
@@ -1195,9 +1198,9 @@ gdk_imlib_create_image_from_xpm_data(char **data)
|
||||
}
|
||||
else
|
||||
{
|
||||
*ptr++ = (unsigned char)cmap[lookup[col[0]][col[1]]].r;
|
||||
*ptr++ = (unsigned char)cmap[lookup[col[0]][col[1]]].g;
|
||||
*ptr++ = (unsigned char)cmap[lookup[col[0]][col[1]]].b;
|
||||
*ptr++ = (unsigned char)cmap[lookup[(int)col[0]][(int)col[1]]].r;
|
||||
*ptr++ = (unsigned char)cmap[lookup[(int)col[0]][(int)col[1]]].g;
|
||||
*ptr++ = (unsigned char)cmap[lookup[(int)col[0]][(int)col[1]]].b;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1207,9 +1210,9 @@ gdk_imlib_create_image_from_xpm_data(char **data)
|
||||
{
|
||||
col[0] = line[i++];
|
||||
col[1] = line[i];
|
||||
*ptr++ = (unsigned char)cmap[lookup[col[0]][col[1]]].r;
|
||||
*ptr++ = (unsigned char)cmap[lookup[col[0]][col[1]]].g;
|
||||
*ptr++ = (unsigned char)cmap[lookup[col[0]][col[1]]].b;
|
||||
*ptr++ = (unsigned char)cmap[lookup[(int)col[0]][(int)col[1]]].r;
|
||||
*ptr++ = (unsigned char)cmap[lookup[(int)col[0]][(int)col[1]]].g;
|
||||
*ptr++ = (unsigned char)cmap[lookup[(int)col[0]][(int)col[1]]].b;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@@ -719,7 +719,7 @@ bool wxTreeCtrl::SelectItem(long itemId)
|
||||
return TRUE;
|
||||
};
|
||||
|
||||
void wxTreeCtrl::SelectItem(wxGenericTreeItem *item)
|
||||
void wxTreeCtrl::SelectItem(wxGenericTreeItem *item, bool bDoEvents )
|
||||
{
|
||||
if (m_current != item)
|
||||
{
|
||||
@@ -732,7 +732,7 @@ void wxTreeCtrl::SelectItem(wxGenericTreeItem *item)
|
||||
m_current->SetHilight( TRUE );
|
||||
RefreshLine( m_current );
|
||||
|
||||
m_current->SendSelected( this );
|
||||
if (bDoEvents) m_current->SendSelected( this );
|
||||
}
|
||||
}
|
||||
|
||||
|
@@ -26,6 +26,8 @@
|
||||
#include <../iodbc/hstmt.h>
|
||||
|
||||
#include <../iodbc/itrace.h>
|
||||
#include <strings.h>
|
||||
#include <stdio.h>
|
||||
|
||||
extern char* _iodbcdm_getkeyvalbydsn();
|
||||
extern char* _iodbcdm_getkeyvalinstr();
|
||||
@@ -292,7 +294,7 @@ RETCODE _iodbcdm_driverunload( HDBC hdbc )
|
||||
GENV_t FAR* genv;
|
||||
HPROC hproc;
|
||||
RETCODE retcode = SQL_SUCCESS;
|
||||
int sqlstat = en_00000;
|
||||
/* int sqlstat = en_00000; */
|
||||
|
||||
if( hdbc == SQL_NULL_HDBC )
|
||||
{
|
||||
@@ -952,16 +954,16 @@ RETCODE SQL_API SQLBrowseConnect (
|
||||
SWORD FAR* pcbConnStrOut )
|
||||
{
|
||||
DBC_t FAR* pdbc = (DBC_t FAR*)hdbc;
|
||||
HDLL hdll;
|
||||
/* HDLL hdll; */
|
||||
char FAR* drv;
|
||||
char drvbuf[1024];
|
||||
char FAR* dsn;
|
||||
char dsnbuf[SQL_MAX_DSN_LENGTH + 1];
|
||||
UCHAR cnstr2drv[1024];
|
||||
/* UCHAR cnstr2drv[1024]; */
|
||||
|
||||
HPROC hproc, dialproc;
|
||||
HPROC hproc /*, dialproc*/ ;
|
||||
|
||||
int sqlstat = en_00000;
|
||||
/* int sqlstat = en_00000; */
|
||||
RETCODE retcode = SQL_SUCCESS;
|
||||
RETCODE setopterr = SQL_SUCCESS;
|
||||
|
||||
|
@@ -32,7 +32,7 @@ HPROC _iodbcdm_getproc( HDBC hdbc, int idx )
|
||||
{
|
||||
DBC_t FAR* pdbc = (DBC_t FAR*)hdbc;
|
||||
ENV_t FAR* penv;
|
||||
HDLL hdll;
|
||||
/* HDLL hdll; */
|
||||
HPROC FAR* phproc;
|
||||
|
||||
if( idx <= 0 || idx > SQL_EXT_API_LAST )
|
||||
|
@@ -28,6 +28,8 @@
|
||||
#include <../iodbc/itrace.h>
|
||||
|
||||
#include "../iodbc/herr.ci"
|
||||
#include <strings.h>
|
||||
#include <stdio.h>
|
||||
|
||||
static HERR _iodbcdm_popsqlerr( HERR herr )
|
||||
{
|
||||
|
@@ -27,6 +27,9 @@
|
||||
|
||||
#include <../iodbc/itrace.h>
|
||||
|
||||
#include <strings.h>
|
||||
#include <stdio.h>
|
||||
|
||||
RETCODE SQL_API SQLDataSources(
|
||||
HENV henv,
|
||||
UWORD fDir,
|
||||
@@ -118,7 +121,7 @@ RETCODE SQL_API SQLGetInfo(
|
||||
HPROC hproc;
|
||||
RETCODE retcode = SQL_SUCCESS;
|
||||
|
||||
DWORD dword;
|
||||
DWORD dword = 0;
|
||||
int size = 0, len = 0;
|
||||
char buf[16] = { '\0' };
|
||||
|
||||
|
@@ -19,6 +19,7 @@
|
||||
#include <../iodbc/isqlext.h>
|
||||
|
||||
#include <stdio.h>
|
||||
#include <strings.h>
|
||||
|
||||
static int
|
||||
upper_strneq(
|
||||
@@ -26,8 +27,8 @@ upper_strneq(
|
||||
char* s2,
|
||||
int n )
|
||||
{
|
||||
int i;
|
||||
char c1, c2;
|
||||
int i;
|
||||
char c1 = 0, c2 = 0;
|
||||
|
||||
for(i=1;i<n;i++)
|
||||
{
|
||||
@@ -108,7 +109,7 @@ readtoken(
|
||||
static char*
|
||||
getinitfile(char* buf, int size)
|
||||
{
|
||||
int i, j;
|
||||
int /* i, */ j;
|
||||
char* ptr;
|
||||
|
||||
j = STRLEN("/odbc.ini") + 1;
|
||||
|
Reference in New Issue
Block a user