/////////////////////////////////////////////////////////////////////////////
-// Name: gtk/settings.cpp
+// Name: src/gtk/settings.cpp
// Purpose:
// Author: Robert Roebling
+// Modified by: Mart Raudsepp (GetMetric)
// Id: $Id$
// Copyright: (c) 1998 Robert Roebling
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
-#ifdef __GNUG__
-#pragma implementation "settings.h"
+#include "wx/settings.h"
+
+#ifndef WX_PRECOMP
+ #include "wx/cmndata.h"
+ #include "wx/toplevel.h"
#endif
-#include "wx/settings.h"
-#include "wx/debug.h"
-#include "wx/module.h"
-#include "wx/cmndata.h"
+#include "wx/fontutil.h"
-#include <gdk/gdk.h>
-#include <gdk/gdkprivate.h>
#include <gtk/gtk.h>
+#include "wx/gtk/private/win_gtk.h"
-extern GdkFont *GtkGetDefaultGuiFont();
-
-
-/*
-#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)))
-
-//wxColour *g_systemWinColour = (wxColour *) NULL;
-wxColour *g_systemBtnFaceColour = (wxColour *) NULL;
-wxColour *g_systemBtnShadowColour = (wxColour *) NULL;
-wxColour *g_systemBtnHighlightColour = (wxColour *) NULL;
-wxColour *g_systemHighlightColour = (wxColour *) NULL;
-wxColour *g_systemHighlightTextColour = (wxColour *) NULL;
-wxColour *g_systemListBoxColour = (wxColour *) NULL;
-wxColour *g_systemBtnTextColour = (wxColour *) NULL;
-
-wxFont *g_systemFont = (wxFont *) NULL;
+bool wxGetFrameExtents(GdkWindow* window, int* left, int* right, int* top, int* bottom);
// ----------------------------------------------------------------------------
-// wxSystemSettingsModule
+// wxSystemSettings implementation
// ----------------------------------------------------------------------------
-class wxSystemSettingsModule : public wxModule
+static wxFont gs_fontSystem;
+
+static GtkContainer* ContainerWidget()
{
-public:
- bool OnInit() { return TRUE; }
- void OnExit()
+ static GtkContainer* s_widget;
+ if (s_widget == NULL)
{
- //delete g_systemWinColour;
- delete g_systemBtnFaceColour;
- delete g_systemBtnShadowColour;
- delete g_systemBtnHighlightColour;
- delete g_systemHighlightColour;
- delete g_systemHighlightTextColour;
- delete g_systemListBoxColour;
- delete g_systemFont;
- delete g_systemBtnTextColour;
+ s_widget = GTK_CONTAINER(gtk_fixed_new());
+ GtkWidget* window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+ gtk_container_add(GTK_CONTAINER(window), GTK_WIDGET(s_widget));
}
- DECLARE_DYNAMIC_CLASS(wxSystemSettingsModule)
-};
-
-IMPLEMENT_DYNAMIC_CLASS(wxSystemSettingsModule, wxModule)
-
-// ----------------------------------------------------------------------------
-// wxSystemSettings implementation
-// ----------------------------------------------------------------------------
+ return s_widget;
+}
-// kind of widget to use in GetColourFromGTKWidget
-enum wxGtkWidgetType
+extern "C" {
+static void style_set(GtkWidget*, GtkStyle*, void*)
{
- wxGTK_BUTTON,
- wxGTK_LIST
-};
+ gs_fontSystem = wxNullFont;
+}
+}
-// the colour we need
-enum wxGtkColourType
-{
- wxGTK_FG,
- wxGTK_BG,
- wxGTK_BASE
-};
-
-// wxSystemSettings::GetSystemColour() helper: get the colours from a GTK+
-// widget style, return true if we did get them, false to use defaults
-static bool GetColourFromGTKWidget(int& red, int& green, int& blue,
- wxGtkWidgetType type = wxGTK_BUTTON,
- GtkStateType state = GTK_STATE_NORMAL,
- wxGtkColourType colour = wxGTK_BG)
+static const GtkStyle* ButtonStyle()
{
- GtkWidget *widget;
- switch ( type )
+ static GtkWidget* s_widget;
+ if (s_widget == NULL)
{
- default:
- wxFAIL_MSG( _T("unexpected GTK widget type") );
- // fall through
-
- case wxGTK_BUTTON:
- widget = gtk_button_new();
- break;
-
- case wxGTK_LIST:
- widget = gtk_list_new();
+ s_widget = gtk_button_new();
+ gtk_container_add(ContainerWidget(), s_widget);
+ gtk_widget_ensure_style(s_widget);
+ g_signal_connect(s_widget, "style_set", G_CALLBACK(style_set), NULL);
}
+ return s_widget->style;
+}
- GtkStyle *def = gtk_rc_get_style( widget );
- if ( !def )
- def = gtk_widget_get_default_style();
-
- bool ok;
- if ( def )
+static const GtkStyle* ListStyle()
+{
+ static GtkWidget* s_widget;
+ if (s_widget == NULL)
{
- GdkColor *col;
- switch ( colour )
- {
- default:
- wxFAIL_MSG( _T("unexpected GTK colour type") );
- // fall through
-
- case wxGTK_FG:
- col = def->fg;
- break;
-
- case wxGTK_BG:
- col = def->bg;
- break;
-
- case wxGTK_BASE:
- col = def->base;
- break;
- }
-
- red = col[state].red;
- green = col[state].green;
- blue = col[state].blue;
+ s_widget = gtk_tree_view_new_with_model(
+ GTK_TREE_MODEL(gtk_list_store_new(1, G_TYPE_INT)));
+ gtk_container_add(ContainerWidget(), s_widget);
+ gtk_widget_ensure_style(s_widget);
+ }
+ return s_widget->style;
+}
- ok = TRUE;
+static const GtkStyle* TextCtrlStyle()
+{
+ static GtkWidget* s_widget;
+ if (s_widget == NULL)
+ {
+ s_widget = gtk_text_view_new();
+ gtk_container_add(ContainerWidget(), s_widget);
+ gtk_widget_ensure_style(s_widget);
}
- else
+ return s_widget->style;
+}
+
+static const GtkStyle* MenuItemStyle()
+{
+ static GtkWidget* s_widget;
+ if (s_widget == NULL)
{
- ok = FALSE;
+ s_widget = gtk_menu_item_new();
+ gtk_container_add(ContainerWidget(), s_widget);
+ gtk_widget_ensure_style(s_widget);
}
+ return s_widget->style;
+}
- gtk_widget_destroy( widget );
+static const GtkStyle* MenuBarStyle()
+{
+ static GtkWidget* s_widget;
+ if (s_widget == NULL)
+ {
+ s_widget = gtk_menu_bar_new();
+ gtk_container_add(ContainerWidget(), s_widget);
+ gtk_widget_ensure_style(s_widget);
+ }
+ return s_widget->style;
+}
- return ok;
+static const GtkStyle* ToolTipStyle()
+{
+ static GtkWidget* s_widget;
+ if (s_widget == NULL)
+ {
+ s_widget = gtk_window_new(GTK_WINDOW_POPUP);
+ const char* name = "gtk-tooltip";
+ if (gtk_check_version(2, 11, 0))
+ name = "gtk-tooltips";
+ gtk_widget_set_name(s_widget, name);
+ gtk_widget_ensure_style(s_widget);
+ }
+ return s_widget->style;
}
wxColour wxSystemSettingsNative::GetColour( wxSystemColour index )
{
+ wxColor color;
switch (index)
{
case wxSYS_COLOUR_SCROLLBAR:
case wxSYS_COLOUR_BACKGROUND:
- case wxSYS_COLOUR_ACTIVECAPTION:
+ //case wxSYS_COLOUR_DESKTOP:
case wxSYS_COLOUR_INACTIVECAPTION:
case wxSYS_COLOUR_MENU:
case wxSYS_COLOUR_WINDOWFRAME:
case wxSYS_COLOUR_ACTIVEBORDER:
case wxSYS_COLOUR_INACTIVEBORDER:
case wxSYS_COLOUR_BTNFACE:
+ //case wxSYS_COLOUR_3DFACE:
case wxSYS_COLOUR_3DLIGHT:
- if (!g_systemBtnFaceColour)
- {
- int red, green, blue;
- if ( !GetColourFromGTKWidget(red, green, blue) )
- {
- red =
- green = 0;
- blue = 0x9c40;
- }
-
- g_systemBtnFaceColour = new wxColour( red >> SHIFT,
- green >> SHIFT,
- blue >> SHIFT );
- }
- return *g_systemBtnFaceColour;
+ color = wxColor(ButtonStyle()->bg[GTK_STATE_NORMAL]);
+ break;
case wxSYS_COLOUR_WINDOW:
- return *wxWHITE;
+ color = wxColor(TextCtrlStyle()->base[GTK_STATE_NORMAL]);
+ break;
+
+ case wxSYS_COLOUR_MENUBAR:
+ color = wxColor(MenuBarStyle()->bg[GTK_STATE_NORMAL]);
+ break;
case wxSYS_COLOUR_3DDKSHADOW:
- return *wxBLACK;
+ color = *wxBLACK;
+ break;
case wxSYS_COLOUR_GRAYTEXT:
case wxSYS_COLOUR_BTNSHADOW:
//case wxSYS_COLOUR_3DSHADOW:
- if (!g_systemBtnShadowColour)
{
- wxColour faceColour(GetSystemColour(wxSYS_COLOUR_3DFACE));
- g_systemBtnShadowColour =
- new wxColour((unsigned char) (faceColour.Red() * 0.666),
- (unsigned char) (faceColour.Green() * 0.666),
- (unsigned char) (faceColour.Blue() * 0.666));
+ wxColour faceColour(GetColour(wxSYS_COLOUR_3DFACE));
+ color =
+ wxColour((unsigned char) (faceColour.Red() * 2 / 3),
+ (unsigned char) (faceColour.Green() * 2 / 3),
+ (unsigned char) (faceColour.Blue() * 2 / 3));
}
+ break;
- return *g_systemBtnShadowColour;
-
- case wxSYS_COLOUR_3DHIGHLIGHT:
- //case wxSYS_COLOUR_BTNHIGHLIGHT:
- return * wxWHITE;
-/* I think this should normally be white (JACS 8/2000)
-
- Hmm, I'm quite sure it shouldn't ... (VZ 20.08.01)
- if (!g_systemBtnHighlightColour)
- {
- g_systemBtnHighlightColour =
- new wxColour( 0xea60 >> SHIFT,
- 0xea60 >> SHIFT,
- 0xea60 >> SHIFT );
- }
- return *g_systemBtnHighlightColour;
-*/
+ case wxSYS_COLOUR_BTNHIGHLIGHT:
+ //case wxSYS_COLOUR_BTNHILIGHT:
+ //case wxSYS_COLOUR_3DHIGHLIGHT:
+ //case wxSYS_COLOUR_3DHILIGHT:
+ color = *wxWHITE;
+ break;
case wxSYS_COLOUR_HIGHLIGHT:
- if (!g_systemHighlightColour)
- {
- int red, green, blue;
- if ( !GetColourFromGTKWidget(red, green, blue,
- wxGTK_BUTTON,
- GTK_STATE_SELECTED) )
- {
- red =
- green = 0;
- blue = 0x9c40;
- }
-
- g_systemHighlightColour = new wxColour( red >> SHIFT,
- green >> SHIFT,
- blue >> SHIFT );
- }
- return *g_systemHighlightColour;
+ color = wxColor(ButtonStyle()->bg[GTK_STATE_SELECTED]);
+ break;
case wxSYS_COLOUR_LISTBOX:
- if (!g_systemListBoxColour)
- {
- int red, green, blue;
- if ( GetColourFromGTKWidget(red, green, blue,
- wxGTK_LIST,
- GTK_STATE_NORMAL,
- wxGTK_BASE) )
- {
- g_systemListBoxColour = new wxColour( red >> SHIFT,
- green >> SHIFT,
- blue >> SHIFT );
- }
- else
- {
- g_systemListBoxColour = new wxColour(*wxWHITE);
- }
- }
- return *g_systemListBoxColour;
+ color = wxColor(ListStyle()->base[GTK_STATE_NORMAL]);
+ break;
+
+ case wxSYS_COLOUR_LISTBOXTEXT:
+ color = wxColor(ListStyle()->text[GTK_STATE_NORMAL]);
+ break;
case wxSYS_COLOUR_MENUTEXT:
case wxSYS_COLOUR_WINDOWTEXT:
case wxSYS_COLOUR_CAPTIONTEXT:
case wxSYS_COLOUR_INACTIVECAPTIONTEXT:
case wxSYS_COLOUR_BTNTEXT:
- case wxSYS_COLOUR_INFOTEXT:
- if (!g_systemBtnTextColour)
- {
- int red, green, blue;
- if ( !GetColourFromGTKWidget(red, green, blue,
- wxGTK_BUTTON,
- GTK_STATE_NORMAL,
- wxGTK_FG) )
- {
- red =
- green =
- blue = 0;
- }
+ color = wxColor(ButtonStyle()->fg[GTK_STATE_NORMAL]);
+ break;
- g_systemBtnTextColour = new wxColour( red >> SHIFT,
- green >> SHIFT,
- blue >> SHIFT );
- }
- return *g_systemBtnTextColour;
+ case wxSYS_COLOUR_INFOBK:
+ color = wxColor(ToolTipStyle()->bg[GTK_STATE_NORMAL]);
+ break;
+
+ case wxSYS_COLOUR_INFOTEXT:
+ color = wxColor(ToolTipStyle()->fg[GTK_STATE_NORMAL]);
+ break;
case wxSYS_COLOUR_HIGHLIGHTTEXT:
- if (!g_systemHighlightTextColour)
- {
- wxColour hclr = GetSystemColour(wxSYS_COLOUR_HIGHLIGHT);
- if (hclr.Red() > 200 && hclr.Green() > 200 && hclr.Blue() > 200)
- g_systemHighlightTextColour = new wxColour(*wxBLACK);
- else
- g_systemHighlightTextColour = new wxColour(*wxWHITE);
- }
- return *g_systemHighlightTextColour;
+ color = wxColor(ButtonStyle()->fg[GTK_STATE_SELECTED]);
+ break;
- case wxSYS_COLOUR_INFOBK:
case wxSYS_COLOUR_APPWORKSPACE:
- return *wxWHITE; // ?
- }
+ color = *wxWHITE; // ?
+ break;
+
+ case wxSYS_COLOUR_ACTIVECAPTION:
+ case wxSYS_COLOUR_MENUHILIGHT:
+ color = wxColor(MenuItemStyle()->bg[GTK_STATE_SELECTED]);
+ break;
+
+ case wxSYS_COLOUR_HOTLIGHT:
+ case wxSYS_COLOUR_GRADIENTACTIVECAPTION:
+ case wxSYS_COLOUR_GRADIENTINACTIVECAPTION:
+ // TODO
+ color = *wxBLACK;
+ break;
+
+ case wxSYS_COLOUR_MAX:
+ default:
+ wxFAIL_MSG( _T("unknown system colour index") );
+ color = *wxWHITE;
+ break;
+ }
- return *wxWHITE;
+ return color;
}
wxFont wxSystemSettingsNative::GetFont( wxSystemFont index )
{
+ wxFont font;
switch (index)
{
case wxSYS_OEM_FIXED_FONT:
case wxSYS_ANSI_FIXED_FONT:
case wxSYS_SYSTEM_FIXED_FONT:
- {
- return *wxNORMAL_FONT;
- }
+ font = *wxNORMAL_FONT;
+ break;
+
case wxSYS_ANSI_VAR_FONT:
case wxSYS_SYSTEM_FONT:
case wxSYS_DEVICE_DEFAULT_FONT:
case wxSYS_DEFAULT_GUI_FONT:
- {
- if (!g_systemFont)
+ if (!gs_fontSystem.Ok())
{
-#if 0
- GdkFont *gdk_font = GtkGetDefaultGuiFont();
- if (gdk_font)
- {
- GSList *font_list = ((GdkFontPrivate*)gdk_font)->names;
- char *name = (char*)font_list->data;
- wxString font_string( name );
- wxFontData font_data;
- g_systemFont = new wxFont( font_string, font_data );
- }
- gtk_widget_destroy( widget );
-#endif
-
- g_systemFont = new wxFont( 12, wxSWISS, wxNORMAL, wxNORMAL );
-
+ wxNativeFontInfo info;
+ info.description = ButtonStyle()->font_desc;
+ gs_fontSystem = wxFont(info);
+ info.description = NULL;
}
- return *g_systemFont;
- }
+ font = gs_fontSystem;
+ break;
default:
- return wxNullFont;
+ break;
+ }
+ return font;
+}
+
+// helper: return the GtkSettings either for the screen the current window is
+// on or for the default screen if window is NULL
+static GtkSettings *GetSettingsForWindowScreen(GdkWindow *window)
+{
+ return window ? gtk_settings_get_for_screen(gdk_drawable_get_screen(window))
+ : gtk_settings_get_default();
+}
+
+static int GetBorderWidth(wxSystemMetric index, wxWindow* win)
+{
+ if (win->m_wxwindow)
+ {
+ wxPizza* pizza = WX_PIZZA(win->m_wxwindow);
+ int x, y;
+ pizza->get_border_widths(x, y);
+ switch (index)
+ {
+ case wxSYS_BORDER_X:
+ case wxSYS_EDGE_X:
+ case wxSYS_FRAMESIZE_X:
+ return x;
+ default:
+ return y;
+ }
}
+ return -1;
}
-int wxSystemSettingsNative::GetMetric( wxSystemMetric index )
+int wxSystemSettingsNative::GetMetric( wxSystemMetric index, wxWindow* win )
{
+ GdkWindow *window = NULL;
+ if(win && GTK_WIDGET_REALIZED(win->GetHandle()))
+ window = win->GetHandle()->window;
+
switch (index)
{
- case wxSYS_SCREEN_X: return gdk_screen_width();
- case wxSYS_SCREEN_Y: return gdk_screen_height();
- case wxSYS_HSCROLL_Y: return 15;
- case wxSYS_VSCROLL_X: return 15;
- default:
- wxFAIL_MSG( wxT("wxSystemSettings::GetMetric not fully implemented") );
+ case wxSYS_BORDER_X:
+ case wxSYS_BORDER_Y:
+ case wxSYS_EDGE_X:
+ case wxSYS_EDGE_Y:
+ case wxSYS_FRAMESIZE_X:
+ case wxSYS_FRAMESIZE_Y:
+ if (win)
+ {
+ wxTopLevelWindow *tlw = wxDynamicCast(win, wxTopLevelWindow);
+ if (!tlw)
+ return GetBorderWidth(index, win);
+ else if (window)
+ {
+ // Get the frame extents from the windowmanager.
+ // In most cases the top extent is the titlebar, so we use the bottom extent
+ // for the heights.
+ int right, bottom;
+ if (wxGetFrameExtents(window, NULL, &right, NULL, &bottom))
+ {
+ switch (index)
+ {
+ case wxSYS_BORDER_X:
+ case wxSYS_EDGE_X:
+ case wxSYS_FRAMESIZE_X:
+ return right; // width of right extent
+ default:
+ return bottom; // height of bottom extent
+ }
+ }
+ }
+ }
+
+ return -1; // no window specified
+
+ case wxSYS_CURSOR_X:
+ case wxSYS_CURSOR_Y:
+ return gdk_display_get_default_cursor_size(
+ window ? gdk_drawable_get_display(window)
+ : gdk_display_get_default());
+
+ case wxSYS_DCLICK_X:
+ case wxSYS_DCLICK_Y:
+ gint dclick_distance;
+ g_object_get(GetSettingsForWindowScreen(window),
+ "gtk-double-click-distance", &dclick_distance, NULL);
+
+ return dclick_distance * 2;
+
+ case wxSYS_DCLICK_MSEC:
+ gint dclick;
+ g_object_get(GetSettingsForWindowScreen(window),
+ "gtk-double-click-time", &dclick, NULL);
+ return dclick;
+
+ case wxSYS_DRAG_X:
+ case wxSYS_DRAG_Y:
+ gint drag_threshold;
+ g_object_get(GetSettingsForWindowScreen(window),
+ "gtk-dnd-drag-threshold", &drag_threshold, NULL);
+
+ // The correct thing here would be to double the value
+ // since that is what the API wants. But the values
+ // are much bigger under GNOME than under Windows and
+ // just seem to much in many cases to be useful.
+ // drag_threshold *= 2;
+
+ return drag_threshold;
+
+ case wxSYS_ICON_X:
+ case wxSYS_ICON_Y:
+ return 32;
+
+ case wxSYS_SCREEN_X:
+ if (window)
+ return gdk_screen_get_width(gdk_drawable_get_screen(window));
+ else
+ return gdk_screen_width();
+
+ case wxSYS_SCREEN_Y:
+ if (window)
+ return gdk_screen_get_height(gdk_drawable_get_screen(window));
+ else
+ return gdk_screen_height();
+
+ case wxSYS_HSCROLL_Y:
+ case wxSYS_VSCROLL_X:
+ return 15;
+
+ case wxSYS_CAPTION_Y:
+ if (!window)
+ // No realized window specified, and no implementation for that case yet.
+ return -1;
+
+ wxASSERT_MSG( wxDynamicCast(win, wxTopLevelWindow),
+ wxT("Asking for caption height of a non toplevel window") );
+
+ // Get the height of the top windowmanager border.
+ // This is the titlebar in most cases. The titlebar might be elsewhere, and
+ // we could check which is the thickest wm border to decide on which side the
+ // titlebar is, but this might lead to interesting behaviours in used code.
+ // Reconsider when we have a way to report to the user on which side it is.
+ {
+ int top;
+ if (wxGetFrameExtents(window, NULL, NULL, &top, NULL))
+ {
+ return top; // top frame extent
+ }
+ }
+
+ // Try a default approach without a window pointer, if possible
+ // ...
+
+ return -1;
+
+ case wxSYS_PENWINDOWS_PRESENT:
+ // No MS Windows for Pen computing extension available in X11 based gtk+.
return 0;
+
+ default:
+ return -1; // metric is unknown
}
}
{
switch (index)
{
- case wxSYS_CAN_ICONIZE_FRAME:
- return FALSE;
- break;
+ case wxSYS_CAN_ICONIZE_FRAME:
+ return false;
+
case wxSYS_CAN_DRAW_FRAME_DECORATIONS:
- return TRUE;
- break;
+ return true;
+
default:
- return FALSE;
+ return false;
}
}
projects / wxWidgets.git / blobdiff