projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Committing in .
[wxWidgets.git]
/
src
/
motif
/
utils.cpp
diff --git
a/src/motif/utils.cpp
b/src/motif/utils.cpp
index e4cdc74fea9b6ffcfc091da98a6238d1b9ba31d2..38275205176309437362078ec6cd67b41ed8a1bd 100644
(file)
--- a/
src/motif/utils.cpp
+++ b/
src/motif/utils.cpp
@@
-41,7
+41,13
@@
#include <sysent.h>
#endif
#include <sysent.h>
#endif
+#ifdef __VMS__
+#pragma message disable nosimpint
+#endif
#include <Xm/Xm.h>
#include <Xm/Xm.h>
+#ifdef __VMS__
+#pragma message enable nosimpint
+#endif
#include "wx/unix/execute.h"
#include "wx/unix/execute.h"
@@
-123,7
+129,7
@@
bool wxCheckForInterrupt(wxWindow *wnd)
// wxExecute stuff
// ----------------------------------------------------------------------------
// wxExecute stuff
// ----------------------------------------------------------------------------
-static void xt_notify_end_process(XtPointer data, int *
fid
,
+static void xt_notify_end_process(XtPointer data, int *
WXUNUSED(fid)
,
XtInputId *id)
{
wxEndProcessData *proc_data = (wxEndProcessData *)data;
XtInputId *id)
{
wxEndProcessData *proc_data = (wxEndProcessData *)data;
@@
-689,8
+695,6
@@
bool wxSetDisplay(const wxString& display_name)
else
return FALSE;
}
else
return FALSE;
}
-
- return FALSE;
}
wxString wxGetDisplayName()
}
wxString wxGetDisplayName()
@@
-727,7
+731,12
@@
char wxFindMnemonic (const char *s)
char * wxFindAccelerator (const char *s)
{
char * wxFindAccelerator (const char *s)
{
- // The accelerator text is after the \t char.
+ // VZ: this function returns incorrect keysym which completely breaks kbd
+ // handling
+ return NULL;
+
+#if 0
+ // The accelerator text is after the \t char.
while (*s && *s != '\t')
s++;
if (*s == '\0')
while (*s && *s != '\t')
s++;
if (*s == '\0')
@@
-774,11
+783,17
@@
char * wxFindAccelerator (const char *s)
}
delete[]tmp;
return wxBuffer;
}
delete[]tmp;
return wxBuffer;
+#endif
}
XmString wxFindAcceleratorText (const char *s)
{
}
XmString wxFindAcceleratorText (const char *s)
{
- // The accelerator text is after the \t char.
+ // VZ: this function returns incorrect keysym which completely breaks kbd
+ // handling
+ return NULL;
+
+#if 0
+ // The accelerator text is after the \t char.
while (*s && *s != '\t')
s++;
if (*s == '\0')
while (*s && *s != '\t')
s++;
if (*s == '\0')
@@
-786,6
+801,7
@@
XmString wxFindAcceleratorText (const char *s)
s++;
XmString text = XmStringCreateSimple ((char *)s);
return text;
s++;
XmString text = XmStringCreateSimple ((char *)s);
return text;
+#endif
}
// ----------------------------------------------------------------------------
}
// ----------------------------------------------------------------------------
@@
-1040,7
+1056,7
@@
void wxHSVToXColor(wxHSV *hsv,XColor *rgb)
int h = hsv->h;
int s = hsv->s;
int v = hsv->v;
int h = hsv->h;
int s = hsv->s;
int v = hsv->v;
- int r
, g, b
;
+ int r
= 0, g = 0, b = 0
;
int i, f;
int p, q, t;
s = (s * wxMAX_RGB) / wxMAX_SV;
int i, f;
int p, q, t;
s = (s * wxMAX_RGB) / wxMAX_SV;
@@
-1073,14
+1089,14
@@
void wxXColorToHSV(wxHSV *hsv,XColor *rgb)
int b = rgb->blue >> 8;
int maxv = wxMax3(r, g, b);
int minv = wxMin3(r, g, b);
int b = rgb->blue >> 8;
int maxv = wxMax3(r, g, b);
int minv = wxMin3(r, g, b);
- int h, s, v;
+ int h
= 0
, s, v;
v = maxv;
if (maxv) s = (maxv - minv) * wxMAX_RGB / maxv;
else s = 0;
if (s == 0) h = 0;
else
{
v = maxv;
if (maxv) s = (maxv - minv) * wxMAX_RGB / maxv;
else s = 0;
if (s == 0) h = 0;
else
{
- int rc, gc, bc, hex;
+ int rc, gc, bc, hex
= 0
;
rc = (maxv - r) * wxMAX_RGB / (maxv - minv);
gc = (maxv - g) * wxMAX_RGB / (maxv - minv);
bc = (maxv - b) * wxMAX_RGB / (maxv - minv);
rc = (maxv - r) * wxMAX_RGB / (maxv - minv);
gc = (maxv - g) * wxMAX_RGB / (maxv - minv);
bc = (maxv - b) * wxMAX_RGB / (maxv - minv);
@@
-1109,7
+1125,7
@@
void wxAllocNearestColor(Display *d,Colormap cmp,XColor *xc)
wxHSV hsv_defs, hsv;
wxXColorToHSV(&hsv,xc);
wxHSV hsv_defs, hsv;
wxXColorToHSV(&hsv,xc);
- int diff, min_diff, pixel = 0;
+ int diff, min_diff
= 0
, pixel = 0;
for(llp = 0;llp < num_colors;llp++)
{
for(llp = 0;llp < num_colors;llp++)
{
@@
-1126,8
+1142,11
@@
void wxAllocNearestColor(Display *d,Colormap cmp,XColor *xc)
xc -> green = color_defs[pixel].green;
xc -> blue = color_defs[pixel].blue;
xc -> flags = DoRed | DoGreen | DoBlue;
xc -> green = color_defs[pixel].green;
xc -> blue = color_defs[pixel].blue;
xc -> flags = DoRed | DoGreen | DoBlue;
+
+/* FIXME, TODO
if (!XAllocColor(d,cmp,xc))
cout << "wxAllocNearestColor : Warning : Cannot find nearest color !\n";
if (!XAllocColor(d,cmp,xc))
cout << "wxAllocNearestColor : Warning : Cannot find nearest color !\n";
+*/
delete[] color_defs;
}
delete[] color_defs;
}