1) minor modifications in fileconf.cpp
2) new MSW function (private.h): wxGetWindowText() which works with wxString instead of (horror) fixed size buffers. All calls to ::GetWindowText() should be replaced with this! 3) remains of casts to float in different wxControl classes removed, (EDIT|BUTTON)_HEIGHT_FROM_CHAR_HEIGHT macros introduced (could be made inline functions as well...) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@765 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -256,7 +256,11 @@ void wxColourDatabase::Initialize ()
|
||||
|
||||
wxColour *wxColourDatabase::FindColour(const wxString& colour)
|
||||
{
|
||||
wxNode *node = Find((char *) (const char *)colour);
|
||||
// VZ: make the comparaison case insensitive
|
||||
wxString str = colour;
|
||||
str.MakeUpper();
|
||||
|
||||
wxNode *node = Find(str);
|
||||
if (node)
|
||||
return (wxColour *)node->Data();
|
||||
|
||||
@@ -290,6 +294,11 @@ wxColour *wxColourDatabase::FindColour(const wxString& colour)
|
||||
#ifdef __WXMOTIF__
|
||||
Display *display = XtDisplay((Widget) wxTheApp->GetTopLevelWidget()) ;
|
||||
#endif
|
||||
#ifdef __XVIEW__
|
||||
Xv_Screen screen = xv_get(xview_server, SERVER_NTH_SCREEN, 0);
|
||||
Xv_opaque root_window = xv_get(screen, XV_ROOT);
|
||||
Display *display = (Display *)xv_get(root_window, XV_DISPLAY);
|
||||
#endif
|
||||
|
||||
/* MATTHEW: [4] Use wxGetMainColormap */
|
||||
if (!XParseColor(display, (Colormap) wxTheApp->GetMainColormap((WXDisplay*) display), colour,&xcolour))
|
||||
|
||||
Reference in New Issue
Block a user