Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added (dummy) implementation of GetMetric(wxSYS_CURSOR_[XY])

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13743 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2002-01-22 15:39:13 +00:00
parent ce914f7319
commit 17d61cbfb4
2 changed files with 22 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/gtk/settings.cpp
View File

@@ -21,42 +21,6 @@
#include <gdk/gdkprivate.h> #include <gdk/gdkprivate.h>
#include <gtk/gtk.h> #include <gtk/gtk.h>
/*
#define wxSYS_COLOUR_SCROLLBAR 0
#define wxSYS_COLOUR_BACKGROUND 1
#define wxSYS_COLOUR_ACTIVECAPTION 2
#define wxSYS_COLOUR_INACTIVECAPTION 3
#define wxSYS_COLOUR_MENU 4
#define wxSYS_COLOUR_WINDOW 5
#define wxSYS_COLOUR_WINDOWFRAME 6
#define wxSYS_COLOUR_MENUTEXT 7
#define wxSYS_COLOUR_WINDOWTEXT 8
#define wxSYS_COLOUR_CAPTIONTEXT 9
#define wxSYS_COLOUR_ACTIVEBORDER 10
#define wxSYS_COLOUR_INACTIVEBORDER 11
#define wxSYS_COLOUR_APPWORKSPACE 12
#define wxSYS_COLOUR_HIGHLIGHT 13
#define wxSYS_COLOUR_HIGHLIGHTTEXT 14
#define wxSYS_COLOUR_BTNFACE 15
#define wxSYS_COLOUR_BTNSHADOW 16
#define wxSYS_COLOUR_GRAYTEXT 17
#define wxSYS_COLOUR_BTNTEXT 18
#define wxSYS_COLOUR_INACTIVECAPTIONTEXT 19
#define wxSYS_COLOUR_BTNHIGHLIGHT 20
#define wxSYS_COLOUR_3DDKSHADOW 21
#define wxSYS_COLOUR_3DLIGHT 22
#define wxSYS_COLOUR_INFOTEXT 23
#define wxSYS_COLOUR_INFOBK 24
#define wxSYS_COLOUR_DESKTOP wxSYS_COLOUR_BACKGROUND
#define wxSYS_COLOUR_3DFACE wxSYS_COLOUR_BTNFACE
#define wxSYS_COLOUR_3DSHADOW wxSYS_COLOUR_BTNSHADOW
#define wxSYS_COLOUR_3DHIGHLIGHT wxSYS_COLOUR_BTNHIGHLIGHT
#define wxSYS_COLOUR_3DHILIGHT wxSYS_COLOUR_BTNHIGHLIGHT
#define wxSYS_COLOUR_BTNHILIGHT wxSYS_COLOUR_BTNHIGHLIGHT
*/
#define SHIFT (8*(sizeof(short int)-sizeof(char))) #define SHIFT (8*(sizeof(short int)-sizeof(char)))
//wxColour *g_systemWinColour = (wxColour *) NULL; //wxColour *g_systemWinColour = (wxColour *) NULL;
@@ -309,6 +273,12 @@ wxColour wxSystemSettingsNative::GetColour( wxSystemColour index )
} }
return *g_systemBtnTextColour; return *g_systemBtnTextColour;
// this (as well as wxSYS_COLOUR_INFOTEXT above) is used for
// tooltip windows - Robert, please change this code to use the
// real GTK tooltips when/if you can (TODO)
case wxSYS_COLOUR_INFOBK:
return wxColour(255, 255, 225);
case wxSYS_COLOUR_HIGHLIGHTTEXT: case wxSYS_COLOUR_HIGHLIGHTTEXT:
if (!g_systemHighlightTextColour) if (!g_systemHighlightTextColour)
{ {
@@ -320,7 +290,6 @@ wxColour wxSystemSettingsNative::GetColour( wxSystemColour index )
} }
return *g_systemHighlightTextColour; return *g_systemHighlightTextColour;
case wxSYS_COLOUR_INFOBK:
case wxSYS_COLOUR_APPWORKSPACE: case wxSYS_COLOUR_APPWORKSPACE:
return *wxWHITE; // ? return *wxWHITE; // ?
} }
@@ -364,6 +333,11 @@ int wxSystemSettingsNative::GetMetric( wxSystemMetric index )
case wxSYS_SCREEN_Y: return gdk_screen_height(); case wxSYS_SCREEN_Y: return gdk_screen_height();
case wxSYS_HSCROLL_Y: return 15; case wxSYS_HSCROLL_Y: return 15;
case wxSYS_VSCROLL_X: return 15; case wxSYS_VSCROLL_X: return 15;
// VZ: is there any way to get the cursor size with GDK?
case wxSYS_CURSOR_X: return 16;
case wxSYS_CURSOR_Y: return 16;
default: default:
wxFAIL_MSG( wxT("wxSystemSettings::GetMetric not fully implemented") ); wxFAIL_MSG( wxT("wxSystemSettings::GetMetric not fully implemented") );
return 0; return 0;

48
src/gtk1/settings.cpp
View File

@@ -21,42 +21,6 @@
#include <gdk/gdkprivate.h> #include <gdk/gdkprivate.h>
#include <gtk/gtk.h> #include <gtk/gtk.h>
/*
#define wxSYS_COLOUR_SCROLLBAR 0
#define wxSYS_COLOUR_BACKGROUND 1
#define wxSYS_COLOUR_ACTIVECAPTION 2
#define wxSYS_COLOUR_INACTIVECAPTION 3
#define wxSYS_COLOUR_MENU 4
#define wxSYS_COLOUR_WINDOW 5
#define wxSYS_COLOUR_WINDOWFRAME 6
#define wxSYS_COLOUR_MENUTEXT 7
#define wxSYS_COLOUR_WINDOWTEXT 8
#define wxSYS_COLOUR_CAPTIONTEXT 9
#define wxSYS_COLOUR_ACTIVEBORDER 10
#define wxSYS_COLOUR_INACTIVEBORDER 11
#define wxSYS_COLOUR_APPWORKSPACE 12
#define wxSYS_COLOUR_HIGHLIGHT 13
#define wxSYS_COLOUR_HIGHLIGHTTEXT 14
#define wxSYS_COLOUR_BTNFACE 15
#define wxSYS_COLOUR_BTNSHADOW 16
#define wxSYS_COLOUR_GRAYTEXT 17
#define wxSYS_COLOUR_BTNTEXT 18
#define wxSYS_COLOUR_INACTIVECAPTIONTEXT 19
#define wxSYS_COLOUR_BTNHIGHLIGHT 20
#define wxSYS_COLOUR_3DDKSHADOW 21
#define wxSYS_COLOUR_3DLIGHT 22
#define wxSYS_COLOUR_INFOTEXT 23
#define wxSYS_COLOUR_INFOBK 24
#define wxSYS_COLOUR_DESKTOP wxSYS_COLOUR_BACKGROUND
#define wxSYS_COLOUR_3DFACE wxSYS_COLOUR_BTNFACE
#define wxSYS_COLOUR_3DSHADOW wxSYS_COLOUR_BTNSHADOW
#define wxSYS_COLOUR_3DHIGHLIGHT wxSYS_COLOUR_BTNHIGHLIGHT
#define wxSYS_COLOUR_3DHILIGHT wxSYS_COLOUR_BTNHIGHLIGHT
#define wxSYS_COLOUR_BTNHILIGHT wxSYS_COLOUR_BTNHIGHLIGHT
*/
#define SHIFT (8*(sizeof(short int)-sizeof(char))) #define SHIFT (8*(sizeof(short int)-sizeof(char)))
//wxColour *g_systemWinColour = (wxColour *) NULL; //wxColour *g_systemWinColour = (wxColour *) NULL;
@@ -309,6 +273,12 @@ wxColour wxSystemSettingsNative::GetColour( wxSystemColour index )
} }
return *g_systemBtnTextColour; return *g_systemBtnTextColour;
// this (as well as wxSYS_COLOUR_INFOTEXT above) is used for
// tooltip windows - Robert, please change this code to use the
// real GTK tooltips when/if you can (TODO)
case wxSYS_COLOUR_INFOBK:
return wxColour(255, 255, 225);
case wxSYS_COLOUR_HIGHLIGHTTEXT: case wxSYS_COLOUR_HIGHLIGHTTEXT:
if (!g_systemHighlightTextColour) if (!g_systemHighlightTextColour)
{ {
@@ -320,7 +290,6 @@ wxColour wxSystemSettingsNative::GetColour( wxSystemColour index )
} }
return *g_systemHighlightTextColour; return *g_systemHighlightTextColour;
case wxSYS_COLOUR_INFOBK:
case wxSYS_COLOUR_APPWORKSPACE: case wxSYS_COLOUR_APPWORKSPACE:
return *wxWHITE; // ? return *wxWHITE; // ?
} }
@@ -364,6 +333,11 @@ int wxSystemSettingsNative::GetMetric( wxSystemMetric index )
case wxSYS_SCREEN_Y: return gdk_screen_height(); case wxSYS_SCREEN_Y: return gdk_screen_height();
case wxSYS_HSCROLL_Y: return 15; case wxSYS_HSCROLL_Y: return 15;
case wxSYS_VSCROLL_X: return 15; case wxSYS_VSCROLL_X: return 15;
// VZ: is there any way to get the cursor size with GDK?
case wxSYS_CURSOR_X: return 16;
case wxSYS_CURSOR_Y: return 16;
default: default:
wxFAIL_MSG( wxT("wxSystemSettings::GetMetric not fully implemented") ); wxFAIL_MSG( wxT("wxSystemSettings::GetMetric not fully implemented") );
return 0; return 0;