projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
post wxUniv merge fixes
[wxWidgets.git]
/
src
/
generic
/
tipwin.cpp
diff --git
a/src/generic/tipwin.cpp
b/src/generic/tipwin.cpp
index 9937d350374c162bd0056801c4f4d8bd4c69cc13..06e94b763647df466649055c08b57a5cbe93ea56 100644
(file)
--- a/
src/generic/tipwin.cpp
+++ b/
src/generic/tipwin.cpp
@@
-34,6
+34,7
@@
#include "wx/tipwin.h"
#include "wx/timer.h"
#include "wx/tipwin.h"
#include "wx/timer.h"
+#include "wx/settings.h"
// ----------------------------------------------------------------------------
// constants
// ----------------------------------------------------------------------------
// constants
@@
-99,12
+100,14
@@
wxTipWindow::wxTipWindow(wxWindow *parent,
{
// set colours
SetForegroundColour(*wxBLACK);
{
// set colours
SetForegroundColour(*wxBLACK);
-#if !defined(__WXPM__)
- SetBackgroundColour(wxColour(0xc3ffff));
+
+#ifdef __WXMSW__
+ wxColour bkCol(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_INFOBK));
#else
#else
- // What is 0xc3ffff, try some legable documentation for those of us who don't memorize hex codes??
- SetBackgroundColour(wxColour(*wxWHITE));
+ wxColour bkCol(wxColour(255, 255, 225));
#endif
#endif
+ SetBackgroundColour(bkCol);
+
// set position and size
int x, y;
wxGetMousePosition(&x, &y);
// set position and size
int x, y;
wxGetMousePosition(&x, &y);
@@
-159,12
+162,12
@@
wxTipWindowView::wxTipWindowView(wxWindow *parent)
{
// set colours
SetForegroundColour(*wxBLACK);
{
// set colours
SetForegroundColour(*wxBLACK);
-#if
!defined(__WXPM__)
-
SetBackgroundColour(wxColour(0xc3ffff
));
+#if
def __WXMSW__
+
wxColour bkCol(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_INFOBK
));
#else
#else
- // What is 0xc3ffff, try some legable documentation for those of us who don't memorize hex codes??
- SetBackgroundColour(wxColour(*wxWHITE));
+ wxColour bkCol(wxColour(255, 255, 225));
#endif
#endif
+ SetBackgroundColour(bkCol);
m_creationTime = wxGetLocalTime();
}
m_creationTime = wxGetLocalTime();
}