AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Added to wxSystemSettings for better GTK+ themes compatibility

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8224 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart 2000-09-01 08:35:30 +00:00
parent cb281cfc8c
commit 37d403aa1c
16 changed files with 1453 additions and 361 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

606
configure vendored
View File

File diff suppressed because it is too large Load Diff

8
include/wx/gtk/menuitem.h
View File

@ -14,6 +14,8 @@
#pragma interface
#endif
#include "wx/bitmap.h"
//-----------------------------------------------------------------------------
// wxMenuItem
//-----------------------------------------------------------------------------
@ -34,6 +36,8 @@ public:
virtual void Enable( bool enable = TRUE );
virtual void Check( bool check = TRUE );
virtual bool IsChecked() const;
virtual void SetBitmap(const wxBitmap& bitmap) { m_bitmap = bitmap; }
virtual const wxBitmap& GetBitmap() const { return m_bitmap; }
#if wxUSE_ACCEL
virtual wxAcceleratorEntry *GetAccel() const;
@ -42,6 +46,8 @@ public:
// implementation
void SetMenuItem(GtkWidget *menuItem) { m_menuItem = menuItem; }
GtkWidget *GetMenuItem() const { return m_menuItem; }
GtkWidget *GetLabelWidget() const { return m_labelWidget; }
void SetLabelWidget(GtkWidget *labelWidget) { m_labelWidget = labelWidget; }
wxString GetFactoryPath() const;
wxString GetHotKey() const { return m_hotKey; }
@ -52,8 +58,10 @@ private:
void DoSetText(const wxString& text);
wxString m_hotKey;
wxBitmap m_bitmap; // Bitmap for menuitem, if any
GtkWidget *m_menuItem; // GtkMenuItem
GtkWidget* m_labelWidget; // Label widget
DECLARE_DYNAMIC_CLASS(wxMenuItem)
};

8
include/wx/gtk1/menuitem.h
View File

@ -14,6 +14,8 @@
#pragma interface
#endif
#include "wx/bitmap.h"
//-----------------------------------------------------------------------------
// wxMenuItem
//-----------------------------------------------------------------------------
@ -34,6 +36,8 @@ public:
virtual void Enable( bool enable = TRUE );
virtual void Check( bool check = TRUE );
virtual bool IsChecked() const;
virtual void SetBitmap(const wxBitmap& bitmap) { m_bitmap = bitmap; }
virtual const wxBitmap& GetBitmap() const { return m_bitmap; }
#if wxUSE_ACCEL
virtual wxAcceleratorEntry *GetAccel() const;
@ -42,6 +46,8 @@ public:
// implementation
void SetMenuItem(GtkWidget *menuItem) { m_menuItem = menuItem; }
GtkWidget *GetMenuItem() const { return m_menuItem; }
GtkWidget *GetLabelWidget() const { return m_labelWidget; }
void SetLabelWidget(GtkWidget *labelWidget) { m_labelWidget = labelWidget; }
wxString GetFactoryPath() const;
wxString GetHotKey() const { return m_hotKey; }
@ -52,8 +58,10 @@ private:
void DoSetText(const wxString& text);
wxString m_hotKey;
wxBitmap m_bitmap; // Bitmap for menuitem, if any
GtkWidget *m_menuItem; // GtkMenuItem
GtkWidget* m_labelWidget; // Label widget
DECLARE_DYNAMIC_CLASS(wxMenuItem)
};

4
include/wx/ownerdrw.h
View File

@ -63,6 +63,10 @@ public:
m_bmpUnchecked = bmpUnchecked;
m_bOwnerDrawn = TRUE; }
void SetBitmap(const wxBitmap& bmpChecked);
{ m_bmpChecked = bmpChecked;
m_bOwnerDrawn = TRUE; }
const wxBitmap& GetBitmap(bool bChecked = TRUE) const
{ return (bChecked ? m_bmpChecked : m_bmpUnchecked); }

2
samples/dialogs/dialogs.cpp
View File

@ -389,7 +389,7 @@ void MyFrame::FileOpen2(wxCommandEvent& WXUNUSED(event) )
s_extDef = path.AfterLast(_T('.'));
wxLogMessage(_T("You selected the file '%s', remembered extension '%s'"),
path, s_extDef);
(const wxChar*) path, (const wxChar*) s_extDef);
}
void MyFrame::FilesOpen(wxCommandEvent& WXUNUSED(event) )

2
samples/notebook/notebook.cpp
View File

@ -47,7 +47,7 @@ bool MyApp::OnInit()
// Problem with generic wxNotebook implementation whereby it doesn't size properly unless
// you set the size again
#if defined(__WIN16__)
#if defined(__WIN16__) || defined(__WXMOTIF__)
int width, height;
frame->GetSize(& width, & height);
frame->SetSize(-1, -1, width, height);

3
src/generic/listctrl.cpp
View File

@ -1231,7 +1231,8 @@ void wxListHeaderWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
// do *not* use the listctrl colour for headers - one day we will have a
// function to set it separately
dc.SetTextForeground( *wxBLACK );
//dc.SetTextForeground( *wxBLACK );
dc.SetTextForeground(wxSystemSettings::GetSystemColour( wxSYS_COLOUR_WINDOWTEXT ));
int x = 1; // left of the header rect
const int y = 1; // top

5
src/generic/sashwin.cpp
View File

@ -98,7 +98,8 @@ void wxSashWindow::OnMouseEvent(wxMouseEvent& event)
// reset the cursor
#if defined(__WXMOTIF__) || defined(__WXGTK__)
SetCursor(* wxSTANDARD_CURSOR);
// Not necessary and in fact inhibits proper cursor setting (JACS 8/2000)
//SetCursor(* wxSTANDARD_CURSOR);
#endif
#ifdef __WXMSW__
SetCursor(wxNullCursor);
@ -655,7 +656,7 @@ void wxSashWindow::SizeWindows()
void wxSashWindow::InitColours()
{
// Shadow colours
#if defined(__WIN95__)
#ifndef __WIN16__
m_faceColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE);
m_mediumShadowColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DSHADOW);
m_darkShadowColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DDKSHADOW);

6
src/generic/splitter.cpp
View File

@ -833,7 +833,7 @@ void wxSplitterWindow::InitColours()
wxDELETE( m_hilightPen );
// Shadow colours
#if defined(__WIN95__)
#ifndef __WIN16__
wxColour faceColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
m_facePen = new wxPen(faceColour, 1, wxSOLID);
m_faceBrush = new wxBrush(faceColour, wxSOLID);
@ -849,14 +849,14 @@ void wxSplitterWindow::InitColours()
wxColour hilightColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DHILIGHT));
m_hilightPen = new wxPen(hilightColour, 1, wxSOLID);
#else // !Win32
#else
m_facePen = new wxPen("LIGHT GREY", 1, wxSOLID);
m_faceBrush = new wxBrush("LIGHT GREY", wxSOLID);
m_mediumShadowPen = new wxPen("GREY", 1, wxSOLID);
m_darkShadowPen = new wxPen("BLACK", 1, wxSOLID);
m_lightShadowPen = new wxPen("LIGHT GREY", 1, wxSOLID);
m_hilightPen = new wxPen("WHITE", 1, wxSOLID);
#endif // Win32/!Win32
#endif // __WIN16__
}
void wxSplitterWindow::SendUnsplitEvent(wxWindow *winRemoved)

3
src/generic/statusbr.cpp
View File

@ -179,6 +179,7 @@ void wxStatusBarGeneric::OnPaint(wxPaintEvent& WXUNUSED(event) )
if ( GetFont().Ok() )
dc.SetFont(GetFont());
dc.SetBackgroundMode(wxTRANSPARENT);
dc.SetTextForeground(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOWTEXT));
for ( i = 0; i < m_nFields; i ++ )
DrawField(dc, i);
@ -320,7 +321,7 @@ bool wxStatusBarGeneric::GetFieldRect(int n, wxRect& rect) const
void wxStatusBarGeneric::InitColours()
{
// Shadow colours
#if defined(__WIN95__)
#ifndef __WIN16__
wxColour mediumShadowColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DSHADOW));
m_mediumShadowPen = wxPen(mediumShadowColour, 1, wxSOLID);

2
src/generic/treectlg.cpp
View File

@ -1818,7 +1818,7 @@ void wxGenericTreeCtrl::PaintLevel( wxGenericTreeItem *item, wxDC &dc, int level
if ( attr && attr->HasTextColour() )
colText = attr->GetTextColour();
else
colText = *wxBLACK;
colText = wxSystemSettings::GetSystemColour( wxSYS_COLOUR_WINDOWTEXT );
}
// prepare to draw

478
src/gtk/menu.cpp
View File

@ -15,6 +15,7 @@
#include "wx/log.h"
#include "wx/intl.h"
#include "wx/app.h"
#include "wx/bitmap.h"
#include "wx/menu.h"
#if wxUSE_ACCEL
@ -35,6 +36,49 @@ extern bool g_isIdle;
static wxString GetHotKey( const wxMenuItem& item );
#endif
////// BEGIN CODE ADAPTED FROM GTKPIXMAPMENUITEM.C IN LIBGNOMEUI //////
#define GTK_TYPE_PIXMAP_MENU_ITEM (gtk_pixmap_menu_item_get_type ())
#define GTK_PIXMAP_MENU_ITEM(obj) (GTK_CHECK_CAST ((obj), GTK_TYPE_PIXMAP_MENU_ITEM, GtkPixmapMenuItem))
#define GTK_PIXMAP_MENU_ITEM_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_PIXMAP_MENU_ITEM, GtkPixmapMenuItemClass))
#define GTK_IS_PIXMAP_MENU_ITEM(obj) (GTK_CHECK_TYPE ((obj), GTK_TYPE_PIXMAP_MENU_ITEM))
#define GTK_IS_PIXMAP_MENU_ITEM_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_PIXMAP_MENU_ITEM))
//#define GTK_PIXMAP_MENU_ITEM_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_PIXMAP_MENU_ITEM))
#define GTK_PIXMAP_MENU_ITEM_GET_CLASS(obj) (GTK_PIXMAP_MENU_ITEM_CLASS( GTK_OBJECT_GET_CLASS(obj)))
#ifndef GTK_MENU_ITEM_GET_CLASS
#define GTK_MENU_ITEM_GET_CLASS(obj) (GTK_MENU_ITEM_CLASS( GTK_OBJECT_GET_CLASS(obj)))
#endif
typedef struct _GtkPixmapMenuItem GtkPixmapMenuItem;
typedef struct _GtkPixmapMenuItemClass GtkPixmapMenuItemClass;
struct _GtkPixmapMenuItem
{
GtkMenuItem menu_item;
GtkWidget *pixmap;
};
struct _GtkPixmapMenuItemClass
{
GtkMenuItemClass parent_class;
guint orig_toggle_size;
guint have_pixmap_count;
};
GtkType gtk_pixmap_menu_item_get_type (void);
GtkWidget* gtk_pixmap_menu_item_new (void);
void gtk_pixmap_menu_item_set_pixmap (GtkPixmapMenuItem *menu_item,
GtkWidget *pixmap);
/* Added by JACS */
GtkWidget* gtk_pixmap_menu_item_new_with_label (const gchar *label, GtkWidget** labelWidget);
////// END CODE ADAPTED FROM GTKPIXMAPMENUITEM.C IN LIBGNOMEUI //////
//-----------------------------------------------------------------------------
// idle system
//-----------------------------------------------------------------------------
@ -668,6 +712,7 @@ wxMenuItem::wxMenuItem(wxMenu *parentMenu,
m_parentMenu = parentMenu;
m_help = help;
m_labelWidget = (GtkWidget *) NULL;
m_menuItem = (GtkWidget *) NULL;
DoSetText(text);
@ -708,7 +753,11 @@ void wxMenuItem::SetText( const wxString& str )
if (m_menuItem)
{
GtkLabel *label = GTK_LABEL( GTK_BIN(m_menuItem)->child );
GtkLabel *label;
if (m_labelWidget)
label = (GtkLabel*) m_labelWidget;
else
label = GTK_LABEL( GTK_BIN(m_menuItem)->child );
/* set new text */
gtk_label_set( label, m_text.mb_str());
@ -872,6 +921,8 @@ bool wxMenu::GtkAppend(wxMenuItem *mitem)
{
GtkWidget *menuItem;
bool appended = FALSE;
if ( mitem->IsSeparator() )
{
#if (GTK_MINOR_VERSION > 0)
@ -924,6 +975,32 @@ bool wxMenu::GtkAppend(wxMenuItem *mitem)
if ( m_invokingWindow )
wxMenubarSetInvokingWindow(mitem->GetSubMenu(), m_invokingWindow);
}
else if (mitem->GetBitmap().Ok()) // An item with bitmap
{
//// UNFINISHED, because I don't know how to handle hotkeys and
//// accelerators :-(
GtkWidget* labelWidget;
menuItem = gtk_pixmap_menu_item_new_with_label(mitem->GetText().mb_str(), &labelWidget);
//menuItem = gtk_pixmap_menu_item_new_with_label("", &labelWidget);
mitem->SetLabelWidget(labelWidget);
//// TODO: should we store the widget somewhere to avoid a memory leak?
GtkWidget* w = gtk_pixmap_new(mitem->GetBitmap().GetPixmap(), mitem->GetBitmap().GetMask() ? mitem->GetBitmap().GetMask()->GetBitmap() : (GdkBitmap* )NULL);
gtk_widget_show(w);
gtk_pixmap_menu_item_set_pixmap(GTK_PIXMAP_MENU_ITEM( menuItem ), w);
gtk_signal_connect( GTK_OBJECT(menuItem), "activate",
GTK_SIGNAL_FUNC(gtk_menu_clicked_callback),
(gpointer)this );
gtk_menu_append( GTK_MENU(m_menu), menuItem );
gtk_widget_show( menuItem );
//mitem->SetMenuItem(menuItem);
//mitem->SetText(mitem->GetText());
appended = TRUE; // We've done this, don't do it again
}
else // a normal item
{
#if (GTK_MINOR_VERSION > 0)
@ -983,8 +1060,11 @@ bool wxMenu::GtkAppend(wxMenuItem *mitem)
}
#if GTK_MINOR_VERSION == 0
gtk_menu_append( GTK_MENU(m_menu), menuItem );
gtk_widget_show( menuItem );
if (!appended)
{
gtk_menu_append( GTK_MENU(m_menu), menuItem );
gtk_widget_show( menuItem );
}
#endif // GTK+ 1.0
mitem->SetMenuItem(menuItem);
@ -1128,3 +1208,395 @@ static wxString GetHotKey( const wxMenuItem& item )
}
#endif // wxUSE_ACCEL
////// BEGIN CODE ADAPTED FROM GTKPIXMAPMENUITEM.C IN LIBGNOMEUI //////
/*
* Copyright (C) 1998, 1999, 2000 Free Software Foundation
* All rights reserved.
*
* This file is part of the Gnome Library.
*
* The Gnome Library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public License as
* published by the Free Software Foundation; either version 2 of the
* License, or (at your option) any later version.
*
* The Gnome Library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public
* License along with the Gnome Library; see the file COPYING.LIB. If not,
* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/
/*
@NOTATION@
*/
/* Author: Dietmar Maurer <dm@vlsivie.tuwien.ac.at> */
//#include "gtkpixmapmenuitem.h"
#include <gtk/gtkaccellabel.h>
#include <gtk/gtksignal.h>
#include <gtk/gtkmenuitem.h>
#include <gtk/gtkmenu.h>
#include <gtk/gtkcontainer.h>
static void gtk_pixmap_menu_item_class_init (GtkPixmapMenuItemClass *klass);
static void gtk_pixmap_menu_item_init (GtkPixmapMenuItem *menu_item);
static void gtk_pixmap_menu_item_draw (GtkWidget *widget,
GdkRectangle *area);
static gint gtk_pixmap_menu_item_expose (GtkWidget *widget,
GdkEventExpose *event);
/* we must override the following functions */
static void gtk_pixmap_menu_item_map (GtkWidget *widget);
static void gtk_pixmap_menu_item_size_allocate (GtkWidget *widget,
GtkAllocation *allocation);
static void gtk_pixmap_menu_item_forall (GtkContainer *container,
gboolean include_internals,
GtkCallback callback,
gpointer callback_data);
static void gtk_pixmap_menu_item_size_request (GtkWidget *widget,
GtkRequisition *requisition);
static void gtk_pixmap_menu_item_remove (GtkContainer *container,
GtkWidget *child);
static void changed_have_pixmap_status (GtkPixmapMenuItem *menu_item);
static GtkMenuItemClass *parent_class = NULL;
#define BORDER_SPACING 3
#define PMAP_WIDTH 20
GtkType
gtk_pixmap_menu_item_get_type (void)
{
static GtkType pixmap_menu_item_type = 0;
if (!pixmap_menu_item_type)
{
GtkTypeInfo pixmap_menu_item_info =
{
"GtkPixmapMenuItem",
sizeof (GtkPixmapMenuItem),
sizeof (GtkPixmapMenuItemClass),
(GtkClassInitFunc) gtk_pixmap_menu_item_class_init,
(GtkObjectInitFunc) gtk_pixmap_menu_item_init,
/* reserved_1 */ NULL,
/* reserved_2 */ NULL,
(GtkClassInitFunc) NULL,
};
pixmap_menu_item_type = gtk_type_unique (gtk_menu_item_get_type (),
&pixmap_menu_item_info);
}
return pixmap_menu_item_type;
}
/**
* gtk_pixmap_menu_item_new
*
* Creates a new pixmap menu item. Use gtk_pixmap_menu_item_set_pixmap()
* to set the pixmap wich is displayed at the left side.
*
* Returns:
* &GtkWidget pointer to new menu item
**/
GtkWidget*
gtk_pixmap_menu_item_new (void)
{
return GTK_WIDGET (gtk_type_new (gtk_pixmap_menu_item_get_type ()));
}
static void
gtk_pixmap_menu_item_class_init (GtkPixmapMenuItemClass *klass)
{
GtkObjectClass *object_class;
GtkWidgetClass *widget_class;
GtkMenuItemClass *menu_item_class;
GtkContainerClass *container_class;
object_class = (GtkObjectClass*) klass;
widget_class = (GtkWidgetClass*) klass;
menu_item_class = (GtkMenuItemClass*) klass;
container_class = (GtkContainerClass*) klass;
parent_class = (GtkMenuItemClass*) gtk_type_class (gtk_menu_item_get_type ());
widget_class->draw = gtk_pixmap_menu_item_draw;
widget_class->expose_event = gtk_pixmap_menu_item_expose;
widget_class->map = gtk_pixmap_menu_item_map;
widget_class->size_allocate = gtk_pixmap_menu_item_size_allocate;
widget_class->size_request = gtk_pixmap_menu_item_size_request;
container_class->forall = gtk_pixmap_menu_item_forall;
container_class->remove = gtk_pixmap_menu_item_remove;
klass->orig_toggle_size = menu_item_class->toggle_size;
klass->have_pixmap_count = 0;
}
static void
gtk_pixmap_menu_item_init (GtkPixmapMenuItem *menu_item)
{
GtkMenuItem *mi;
mi = GTK_MENU_ITEM (menu_item);
menu_item->pixmap = NULL;
}
static void
gtk_pixmap_menu_item_draw (GtkWidget *widget,
GdkRectangle *area)
{
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_PIXMAP_MENU_ITEM (widget));
g_return_if_fail (area != NULL);
if (GTK_WIDGET_CLASS (parent_class)->draw)
(* GTK_WIDGET_CLASS (parent_class)->draw) (widget, area);
if (GTK_WIDGET_DRAWABLE (widget) &&
GTK_PIXMAP_MENU_ITEM(widget)->pixmap) {
gtk_widget_draw(GTK_WIDGET(GTK_PIXMAP_MENU_ITEM(widget)->pixmap),NULL);
}
}
static gint
gtk_pixmap_menu_item_expose (GtkWidget *widget,
GdkEventExpose *event)
{
g_return_val_if_fail (widget != NULL, FALSE);
g_return_val_if_fail (GTK_IS_PIXMAP_MENU_ITEM (widget), FALSE);
g_return_val_if_fail (event != NULL, FALSE);
if (GTK_WIDGET_CLASS (parent_class)->expose_event)
(* GTK_WIDGET_CLASS (parent_class)->expose_event) (widget, event);
if (GTK_WIDGET_DRAWABLE (widget) &&
GTK_PIXMAP_MENU_ITEM(widget)->pixmap) {
gtk_widget_draw(GTK_WIDGET(GTK_PIXMAP_MENU_ITEM(widget)->pixmap),NULL);
}
return FALSE;
}
/**
* gtk_pixmap_menu_item_set_pixmap
* @menu_item: Pointer to the pixmap menu item
* @pixmap: Pointer to a pixmap widget
*
* Set the pixmap of the menu item.
*
**/
void
gtk_pixmap_menu_item_set_pixmap (GtkPixmapMenuItem *menu_item,
GtkWidget *pixmap)
{
g_return_if_fail (menu_item != NULL);
g_return_if_fail (pixmap != NULL);
g_return_if_fail (GTK_IS_PIXMAP_MENU_ITEM (menu_item));
g_return_if_fail (GTK_IS_WIDGET (pixmap));
g_return_if_fail (menu_item->pixmap == NULL);
gtk_widget_set_parent (pixmap, GTK_WIDGET (menu_item));
menu_item->pixmap = pixmap;
if (GTK_WIDGET_REALIZED (pixmap->parent) &&
!GTK_WIDGET_REALIZED (pixmap))
gtk_widget_realize (pixmap);
if (GTK_WIDGET_VISIBLE (pixmap->parent)) {
if (GTK_WIDGET_MAPPED (pixmap->parent) &&
GTK_WIDGET_VISIBLE(pixmap) &&
!GTK_WIDGET_MAPPED (pixmap))
gtk_widget_map (pixmap);
}
changed_have_pixmap_status(menu_item);
if (GTK_WIDGET_VISIBLE (pixmap) && GTK_WIDGET_VISIBLE (menu_item))
gtk_widget_queue_resize (pixmap);
}
static void
gtk_pixmap_menu_item_map (GtkWidget *widget)
{
GtkPixmapMenuItem *menu_item;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_PIXMAP_MENU_ITEM (widget));
menu_item = GTK_PIXMAP_MENU_ITEM(widget);
GTK_WIDGET_CLASS(parent_class)->map(widget);
if (menu_item->pixmap &&
GTK_WIDGET_VISIBLE (menu_item->pixmap) &&
!GTK_WIDGET_MAPPED (menu_item->pixmap))
gtk_widget_map (menu_item->pixmap);
}
static void
gtk_pixmap_menu_item_size_allocate (GtkWidget *widget,
GtkAllocation *allocation)
{
GtkPixmapMenuItem *pmenu_item;
pmenu_item = GTK_PIXMAP_MENU_ITEM(widget);
if (pmenu_item->pixmap && GTK_WIDGET_VISIBLE(pmenu_item))
{
GtkAllocation child_allocation;
int border_width;
border_width = GTK_CONTAINER (widget)->border_width;
child_allocation.width = pmenu_item->pixmap->requisition.width;
child_allocation.height = pmenu_item->pixmap->requisition.height;
child_allocation.x = border_width + BORDER_SPACING;
child_allocation.y = (border_width + BORDER_SPACING
+ (((allocation->height - child_allocation.height) - child_allocation.x)
/ 2)); /* center pixmaps vertically */
gtk_widget_size_allocate (pmenu_item->pixmap, &child_allocation);
}
if (GTK_WIDGET_CLASS (parent_class)->size_allocate)
GTK_WIDGET_CLASS(parent_class)->size_allocate (widget, allocation);
}
static void
gtk_pixmap_menu_item_forall (GtkContainer *container,
gboolean include_internals,
GtkCallback callback,
gpointer callback_data)
{
GtkPixmapMenuItem *menu_item;
g_return_if_fail (container != NULL);
g_return_if_fail (GTK_IS_PIXMAP_MENU_ITEM (container));
g_return_if_fail (callback != NULL);
menu_item = GTK_PIXMAP_MENU_ITEM (container);
if (menu_item->pixmap)
(* callback) (menu_item->pixmap, callback_data);
GTK_CONTAINER_CLASS(parent_class)->forall(container,include_internals,
callback,callback_data);
}
static void
gtk_pixmap_menu_item_size_request (GtkWidget *widget,
GtkRequisition *requisition)
{
GtkPixmapMenuItem *menu_item;
GtkRequisition req = {0, 0};
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_MENU_ITEM (widget));
g_return_if_fail (requisition != NULL);
GTK_WIDGET_CLASS(parent_class)->size_request(widget,requisition);
menu_item = GTK_PIXMAP_MENU_ITEM (widget);
if (menu_item->pixmap)
gtk_widget_size_request(menu_item->pixmap, &req);
requisition->height = MAX(req.height + GTK_CONTAINER(widget)->border_width + BORDER_SPACING, (unsigned int) requisition->height);
requisition->width += (req.width + GTK_CONTAINER(widget)->border_width + BORDER_SPACING);
}
static void
gtk_pixmap_menu_item_remove (GtkContainer *container,
GtkWidget *child)
{
GtkBin *bin;
gboolean widget_was_visible;
g_return_if_fail (container != NULL);
g_return_if_fail (GTK_IS_PIXMAP_MENU_ITEM (container));
g_return_if_fail (child != NULL);
g_return_if_fail (GTK_IS_WIDGET (child));
bin = GTK_BIN (container);
g_return_if_fail ((bin->child == child ||
(GTK_PIXMAP_MENU_ITEM(container)->pixmap == child)));
widget_was_visible = GTK_WIDGET_VISIBLE (child);
gtk_widget_unparent (child);
if (bin->child == child)
bin->child = NULL;
else {
GTK_PIXMAP_MENU_ITEM(container)->pixmap = NULL;
changed_have_pixmap_status(GTK_PIXMAP_MENU_ITEM(container));
}
if (widget_was_visible)
gtk_widget_queue_resize (GTK_WIDGET (container));
}
/* important to only call this if there was actually a _change_ in pixmap == NULL */
static void
changed_have_pixmap_status (GtkPixmapMenuItem *menu_item)
{
if (menu_item->pixmap != NULL) {
GTK_PIXMAP_MENU_ITEM_GET_CLASS(menu_item)->have_pixmap_count += 1;
if (GTK_PIXMAP_MENU_ITEM_GET_CLASS(menu_item)->have_pixmap_count == 1) {
/* Install pixmap toggle size */
GTK_MENU_ITEM_GET_CLASS(menu_item)->toggle_size = MAX(GTK_PIXMAP_MENU_ITEM_GET_CLASS(menu_item)->orig_toggle_size, PMAP_WIDTH);
}
} else {
GTK_PIXMAP_MENU_ITEM_GET_CLASS(menu_item)->have_pixmap_count -= 1;
if (GTK_PIXMAP_MENU_ITEM_GET_CLASS(menu_item)->have_pixmap_count == 0) {
/* Install normal toggle size */
GTK_MENU_ITEM_GET_CLASS(menu_item)->toggle_size = GTK_PIXMAP_MENU_ITEM_GET_CLASS(menu_item)->orig_toggle_size;
}
}
/* Note that we actually need to do this for _all_ GtkPixmapMenuItem
whenever the klass->toggle_size changes; but by doing it anytime
this function is called, we get the same effect, just because of
how the preferences option to show pixmaps works. Bogus, broken.
*/
if (GTK_WIDGET_VISIBLE(GTK_WIDGET(menu_item)))
gtk_widget_queue_resize(GTK_WIDGET(menu_item));
}
/* Added by JACS */
GtkWidget*
gtk_pixmap_menu_item_new_with_label (const gchar *label, GtkWidget** labelWidget)
{
GtkWidget *menu_item;
GtkWidget *accel_label;
menu_item = gtk_pixmap_menu_item_new ();
accel_label = gtk_accel_label_new (label);
if (labelWidget)
*labelWidget = accel_label;
gtk_misc_set_alignment (GTK_MISC (accel_label), 0.0, 0.5);
gtk_container_add (GTK_CONTAINER (menu_item), accel_label);
gtk_accel_label_set_accel_widget (GTK_ACCEL_LABEL (accel_label), menu_item);
gtk_widget_show (accel_label);
return menu_item;
}
////// END CODE ADAPTED FROM GTKPIXMAPMENUITEM.C IN LIBGNOMEUI //////

77
src/gtk/settings.cpp
View File

@ -69,6 +69,7 @@ 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;
@ -82,6 +83,7 @@ void wxSystemSettings::Done()
delete g_systemHighlightTextColour;
delete g_systemListBoxColour;
delete g_systemFont;
delete g_systemBtnTextColour;
}
wxColour wxSystemSettings::GetSystemColour( int index )
@ -99,6 +101,34 @@ wxColour wxSystemSettings::GetSystemColour( int index )
case wxSYS_COLOUR_BTNFACE:
case wxSYS_COLOUR_3DLIGHT:
{
if (!g_systemBtnFaceColour)
{
GtkWidget *widget = gtk_button_new();
GtkStyle *def = gtk_rc_get_style( widget );
if (!def)
def = gtk_widget_get_default_style();
if (def)
{
int red = def->bg[GTK_STATE_NORMAL].red;
int green = def->bg[GTK_STATE_NORMAL].green;
int blue = def->bg[GTK_STATE_NORMAL].blue;
g_systemBtnFaceColour =
new wxColour( red >> SHIFT,
green >> SHIFT,
blue >> SHIFT );
}
else
{
g_systemBtnFaceColour =
new wxColour( 0 >> SHIFT,
0 >> SHIFT,
0x9c40 >> SHIFT );
}
gtk_widget_destroy( widget );
}
return *g_systemBtnFaceColour;
/*
if (!g_systemBtnFaceColour)
{
g_systemBtnFaceColour =
@ -107,14 +137,29 @@ wxColour wxSystemSettings::GetSystemColour( int index )
0xd6d6 >> SHIFT );
}
return *g_systemBtnFaceColour;
*/
}
case wxSYS_COLOUR_WINDOW:
{
return *wxWHITE;
}
case wxSYS_COLOUR_3DDKSHADOW:
{
return *wxBLACK;
}
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(faceColour.Red() * 0.666,
faceColour.Green() * 0.666,
faceColour.Blue() * 0.666);
}
/*
if (!g_systemBtnShadowColour)
{
g_systemBtnShadowColour =
@ -122,10 +167,14 @@ wxColour wxSystemSettings::GetSystemColour( int index )
0x7530 >> SHIFT,
0x7530 >> SHIFT );
}
*/
return *g_systemBtnShadowColour;
}
case wxSYS_COLOUR_BTNHIGHLIGHT:
case wxSYS_COLOUR_3DHIGHLIGHT:
//case wxSYS_COLOUR_BTNHIGHLIGHT:
{
return * wxWHITE;
/* I think this should normally be white (JACS 8/2000)
if (!g_systemBtnHighlightColour)
{
g_systemBtnHighlightColour =
@ -134,6 +183,7 @@ wxColour wxSystemSettings::GetSystemColour( int index )
0xea60 >> SHIFT );
}
return *g_systemBtnHighlightColour;
*/
}
case wxSYS_COLOUR_HIGHLIGHT:
{
@ -196,7 +246,30 @@ wxColour wxSystemSettings::GetSystemColour( int index )
case wxSYS_COLOUR_BTNTEXT:
case wxSYS_COLOUR_INFOTEXT:
{
return *wxBLACK;
if (!g_systemBtnTextColour)
{
GtkWidget *widget = gtk_button_new();
GtkStyle *def = gtk_rc_get_style( widget );
if (!def)
def = gtk_widget_get_default_style();
if (def)
{
int red = def->fg[GTK_STATE_NORMAL].red;
int green = def->fg[GTK_STATE_NORMAL].green;
int blue = def->fg[GTK_STATE_NORMAL].blue;
g_systemBtnTextColour =
new wxColour( red >> SHIFT,
green >> SHIFT,
blue >> SHIFT );
}
else
{
g_systemBtnTextColour =
new wxColour(0, 0, 0);
}
gtk_widget_destroy( widget );
}
return *g_systemBtnTextColour;
}
case wxSYS_COLOUR_HIGHLIGHTTEXT:
{

478
src/gtk1/menu.cpp
View File

@ -15,6 +15,7 @@
#include "wx/log.h"
#include "wx/intl.h"
#include "wx/app.h"
#include "wx/bitmap.h"
#include "wx/menu.h"
#if wxUSE_ACCEL
@ -35,6 +36,49 @@ extern bool g_isIdle;
static wxString GetHotKey( const wxMenuItem& item );
#endif
////// BEGIN CODE ADAPTED FROM GTKPIXMAPMENUITEM.C IN LIBGNOMEUI //////
#define GTK_TYPE_PIXMAP_MENU_ITEM (gtk_pixmap_menu_item_get_type ())
#define GTK_PIXMAP_MENU_ITEM(obj) (GTK_CHECK_CAST ((obj), GTK_TYPE_PIXMAP_MENU_ITEM, GtkPixmapMenuItem))
#define GTK_PIXMAP_MENU_ITEM_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_PIXMAP_MENU_ITEM, GtkPixmapMenuItemClass))
#define GTK_IS_PIXMAP_MENU_ITEM(obj) (GTK_CHECK_TYPE ((obj), GTK_TYPE_PIXMAP_MENU_ITEM))
#define GTK_IS_PIXMAP_MENU_ITEM_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_PIXMAP_MENU_ITEM))
//#define GTK_PIXMAP_MENU_ITEM_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_PIXMAP_MENU_ITEM))
#define GTK_PIXMAP_MENU_ITEM_GET_CLASS(obj) (GTK_PIXMAP_MENU_ITEM_CLASS( GTK_OBJECT_GET_CLASS(obj)))
#ifndef GTK_MENU_ITEM_GET_CLASS
#define GTK_MENU_ITEM_GET_CLASS(obj) (GTK_MENU_ITEM_CLASS( GTK_OBJECT_GET_CLASS(obj)))
#endif
typedef struct _GtkPixmapMenuItem GtkPixmapMenuItem;
typedef struct _GtkPixmapMenuItemClass GtkPixmapMenuItemClass;
struct _GtkPixmapMenuItem
{
GtkMenuItem menu_item;
GtkWidget *pixmap;
};
struct _GtkPixmapMenuItemClass
{
GtkMenuItemClass parent_class;
guint orig_toggle_size;
guint have_pixmap_count;
};
GtkType gtk_pixmap_menu_item_get_type (void);
GtkWidget* gtk_pixmap_menu_item_new (void);
void gtk_pixmap_menu_item_set_pixmap (GtkPixmapMenuItem *menu_item,
GtkWidget *pixmap);
/* Added by JACS */
GtkWidget* gtk_pixmap_menu_item_new_with_label (const gchar *label, GtkWidget** labelWidget);
////// END CODE ADAPTED FROM GTKPIXMAPMENUITEM.C IN LIBGNOMEUI //////
//-----------------------------------------------------------------------------
// idle system
//-----------------------------------------------------------------------------
@ -668,6 +712,7 @@ wxMenuItem::wxMenuItem(wxMenu *parentMenu,
m_parentMenu = parentMenu;
m_help = help;
m_labelWidget = (GtkWidget *) NULL;
m_menuItem = (GtkWidget *) NULL;
DoSetText(text);
@ -708,7 +753,11 @@ void wxMenuItem::SetText( const wxString& str )
if (m_menuItem)
{
GtkLabel *label = GTK_LABEL( GTK_BIN(m_menuItem)->child );
GtkLabel *label;
if (m_labelWidget)
label = (GtkLabel*) m_labelWidget;
else
label = GTK_LABEL( GTK_BIN(m_menuItem)->child );
/* set new text */
gtk_label_set( label, m_text.mb_str());
@ -872,6 +921,8 @@ bool wxMenu::GtkAppend(wxMenuItem *mitem)
{
GtkWidget *menuItem;
bool appended = FALSE;
if ( mitem->IsSeparator() )
{
#if (GTK_MINOR_VERSION > 0)
@ -924,6 +975,32 @@ bool wxMenu::GtkAppend(wxMenuItem *mitem)
if ( m_invokingWindow )
wxMenubarSetInvokingWindow(mitem->GetSubMenu(), m_invokingWindow);
}
else if (mitem->GetBitmap().Ok()) // An item with bitmap
{
//// UNFINISHED, because I don't know how to handle hotkeys and
//// accelerators :-(
GtkWidget* labelWidget;
menuItem = gtk_pixmap_menu_item_new_with_label(mitem->GetText().mb_str(), &labelWidget);
//menuItem = gtk_pixmap_menu_item_new_with_label("", &labelWidget);
mitem->SetLabelWidget(labelWidget);
//// TODO: should we store the widget somewhere to avoid a memory leak?
GtkWidget* w = gtk_pixmap_new(mitem->GetBitmap().GetPixmap(), mitem->GetBitmap().GetMask() ? mitem->GetBitmap().GetMask()->GetBitmap() : (GdkBitmap* )NULL);
gtk_widget_show(w);
gtk_pixmap_menu_item_set_pixmap(GTK_PIXMAP_MENU_ITEM( menuItem ), w);
gtk_signal_connect( GTK_OBJECT(menuItem), "activate",
GTK_SIGNAL_FUNC(gtk_menu_clicked_callback),
(gpointer)this );
gtk_menu_append( GTK_MENU(m_menu), menuItem );
gtk_widget_show( menuItem );
//mitem->SetMenuItem(menuItem);
//mitem->SetText(mitem->GetText());
appended = TRUE; // We've done this, don't do it again
}
else // a normal item
{
#if (GTK_MINOR_VERSION > 0)
@ -983,8 +1060,11 @@ bool wxMenu::GtkAppend(wxMenuItem *mitem)
}
#if GTK_MINOR_VERSION == 0
gtk_menu_append( GTK_MENU(m_menu), menuItem );
gtk_widget_show( menuItem );
if (!appended)
{
gtk_menu_append( GTK_MENU(m_menu), menuItem );
gtk_widget_show( menuItem );
}
#endif // GTK+ 1.0
mitem->SetMenuItem(menuItem);
@ -1128,3 +1208,395 @@ static wxString GetHotKey( const wxMenuItem& item )
}
#endif // wxUSE_ACCEL
////// BEGIN CODE ADAPTED FROM GTKPIXMAPMENUITEM.C IN LIBGNOMEUI //////
/*
* Copyright (C) 1998, 1999, 2000 Free Software Foundation
* All rights reserved.
*
* This file is part of the Gnome Library.
*
* The Gnome Library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public License as
* published by the Free Software Foundation; either version 2 of the
* License, or (at your option) any later version.
*
* The Gnome Library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public
* License along with the Gnome Library; see the file COPYING.LIB. If not,
* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/
/*
@NOTATION@
*/
/* Author: Dietmar Maurer <dm@vlsivie.tuwien.ac.at> */
//#include "gtkpixmapmenuitem.h"
#include <gtk/gtkaccellabel.h>
#include <gtk/gtksignal.h>
#include <gtk/gtkmenuitem.h>
#include <gtk/gtkmenu.h>
#include <gtk/gtkcontainer.h>
static void gtk_pixmap_menu_item_class_init (GtkPixmapMenuItemClass *klass);
static void gtk_pixmap_menu_item_init (GtkPixmapMenuItem *menu_item);
static void gtk_pixmap_menu_item_draw (GtkWidget *widget,
GdkRectangle *area);
static gint gtk_pixmap_menu_item_expose (GtkWidget *widget,
GdkEventExpose *event);
/* we must override the following functions */
static void gtk_pixmap_menu_item_map (GtkWidget *widget);
static void gtk_pixmap_menu_item_size_allocate (GtkWidget *widget,
GtkAllocation *allocation);
static void gtk_pixmap_menu_item_forall (GtkContainer *container,
gboolean include_internals,
GtkCallback callback,
gpointer callback_data);
static void gtk_pixmap_menu_item_size_request (GtkWidget *widget,
GtkRequisition *requisition);
static void gtk_pixmap_menu_item_remove (GtkContainer *container,
GtkWidget *child);
static void changed_have_pixmap_status (GtkPixmapMenuItem *menu_item);
static GtkMenuItemClass *parent_class = NULL;
#define BORDER_SPACING 3
#define PMAP_WIDTH 20
GtkType
gtk_pixmap_menu_item_get_type (void)
{
static GtkType pixmap_menu_item_type = 0;
if (!pixmap_menu_item_type)
{
GtkTypeInfo pixmap_menu_item_info =
{
"GtkPixmapMenuItem",
sizeof (GtkPixmapMenuItem),
sizeof (GtkPixmapMenuItemClass),
(GtkClassInitFunc) gtk_pixmap_menu_item_class_init,
(GtkObjectInitFunc) gtk_pixmap_menu_item_init,
/* reserved_1 */ NULL,
/* reserved_2 */ NULL,
(GtkClassInitFunc) NULL,
};
pixmap_menu_item_type = gtk_type_unique (gtk_menu_item_get_type (),
&pixmap_menu_item_info);
}
return pixmap_menu_item_type;
}
/**
* gtk_pixmap_menu_item_new
*
* Creates a new pixmap menu item. Use gtk_pixmap_menu_item_set_pixmap()
* to set the pixmap wich is displayed at the left side.
*
* Returns:
* &GtkWidget pointer to new menu item
**/
GtkWidget*
gtk_pixmap_menu_item_new (void)
{
return GTK_WIDGET (gtk_type_new (gtk_pixmap_menu_item_get_type ()));
}
static void
gtk_pixmap_menu_item_class_init (GtkPixmapMenuItemClass *klass)
{
GtkObjectClass *object_class;
GtkWidgetClass *widget_class;
GtkMenuItemClass *menu_item_class;
GtkContainerClass *container_class;
object_class = (GtkObjectClass*) klass;
widget_class = (GtkWidgetClass*) klass;
menu_item_class = (GtkMenuItemClass*) klass;
container_class = (GtkContainerClass*) klass;
parent_class = (GtkMenuItemClass*) gtk_type_class (gtk_menu_item_get_type ());
widget_class->draw = gtk_pixmap_menu_item_draw;
widget_class->expose_event = gtk_pixmap_menu_item_expose;
widget_class->map = gtk_pixmap_menu_item_map;
widget_class->size_allocate = gtk_pixmap_menu_item_size_allocate;
widget_class->size_request = gtk_pixmap_menu_item_size_request;
container_class->forall = gtk_pixmap_menu_item_forall;
container_class->remove = gtk_pixmap_menu_item_remove;
klass->orig_toggle_size = menu_item_class->toggle_size;
klass->have_pixmap_count = 0;
}
static void
gtk_pixmap_menu_item_init (GtkPixmapMenuItem *menu_item)
{
GtkMenuItem *mi;
mi = GTK_MENU_ITEM (menu_item);
menu_item->pixmap = NULL;
}
static void
gtk_pixmap_menu_item_draw (GtkWidget *widget,
GdkRectangle *area)
{
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_PIXMAP_MENU_ITEM (widget));
g_return_if_fail (area != NULL);
if (GTK_WIDGET_CLASS (parent_class)->draw)
(* GTK_WIDGET_CLASS (parent_class)->draw) (widget, area);
if (GTK_WIDGET_DRAWABLE (widget) &&
GTK_PIXMAP_MENU_ITEM(widget)->pixmap) {
gtk_widget_draw(GTK_WIDGET(GTK_PIXMAP_MENU_ITEM(widget)->pixmap),NULL);
}
}
static gint
gtk_pixmap_menu_item_expose (GtkWidget *widget,
GdkEventExpose *event)
{
g_return_val_if_fail (widget != NULL, FALSE);
g_return_val_if_fail (GTK_IS_PIXMAP_MENU_ITEM (widget), FALSE);
g_return_val_if_fail (event != NULL, FALSE);
if (GTK_WIDGET_CLASS (parent_class)->expose_event)
(* GTK_WIDGET_CLASS (parent_class)->expose_event) (widget, event);
if (GTK_WIDGET_DRAWABLE (widget) &&
GTK_PIXMAP_MENU_ITEM(widget)->pixmap) {
gtk_widget_draw(GTK_WIDGET(GTK_PIXMAP_MENU_ITEM(widget)->pixmap),NULL);
}
return FALSE;
}
/**
* gtk_pixmap_menu_item_set_pixmap
* @menu_item: Pointer to the pixmap menu item
* @pixmap: Pointer to a pixmap widget
*
* Set the pixmap of the menu item.
*
**/
void
gtk_pixmap_menu_item_set_pixmap (GtkPixmapMenuItem *menu_item,
GtkWidget *pixmap)
{
g_return_if_fail (menu_item != NULL);
g_return_if_fail (pixmap != NULL);
g_return_if_fail (GTK_IS_PIXMAP_MENU_ITEM (menu_item));
g_return_if_fail (GTK_IS_WIDGET (pixmap));
g_return_if_fail (menu_item->pixmap == NULL);
gtk_widget_set_parent (pixmap, GTK_WIDGET (menu_item));
menu_item->pixmap = pixmap;
if (GTK_WIDGET_REALIZED (pixmap->parent) &&
!GTK_WIDGET_REALIZED (pixmap))
gtk_widget_realize (pixmap);
if (GTK_WIDGET_VISIBLE (pixmap->parent)) {
if (GTK_WIDGET_MAPPED (pixmap->parent) &&
GTK_WIDGET_VISIBLE(pixmap) &&
!GTK_WIDGET_MAPPED (pixmap))
gtk_widget_map (pixmap);
}
changed_have_pixmap_status(menu_item);
if (GTK_WIDGET_VISIBLE (pixmap) && GTK_WIDGET_VISIBLE (menu_item))
gtk_widget_queue_resize (pixmap);
}
static void
gtk_pixmap_menu_item_map (GtkWidget *widget)
{
GtkPixmapMenuItem *menu_item;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_PIXMAP_MENU_ITEM (widget));
menu_item = GTK_PIXMAP_MENU_ITEM(widget);
GTK_WIDGET_CLASS(parent_class)->map(widget);
if (menu_item->pixmap &&
GTK_WIDGET_VISIBLE (menu_item->pixmap) &&
!GTK_WIDGET_MAPPED (menu_item->pixmap))
gtk_widget_map (menu_item->pixmap);
}
static void
gtk_pixmap_menu_item_size_allocate (GtkWidget *widget,
GtkAllocation *allocation)
{
GtkPixmapMenuItem *pmenu_item;
pmenu_item = GTK_PIXMAP_MENU_ITEM(widget);
if (pmenu_item->pixmap && GTK_WIDGET_VISIBLE(pmenu_item))
{
GtkAllocation child_allocation;
int border_width;
border_width = GTK_CONTAINER (widget)->border_width;
child_allocation.width = pmenu_item->pixmap->requisition.width;
child_allocation.height = pmenu_item->pixmap->requisition.height;
child_allocation.x = border_width + BORDER_SPACING;
child_allocation.y = (border_width + BORDER_SPACING
+ (((allocation->height - child_allocation.height) - child_allocation.x)
/ 2)); /* center pixmaps vertically */
gtk_widget_size_allocate (pmenu_item->pixmap, &child_allocation);
}
if (GTK_WIDGET_CLASS (parent_class)->size_allocate)
GTK_WIDGET_CLASS(parent_class)->size_allocate (widget, allocation);
}
static void
gtk_pixmap_menu_item_forall (GtkContainer *container,
gboolean include_internals,
GtkCallback callback,
gpointer callback_data)
{
GtkPixmapMenuItem *menu_item;
g_return_if_fail (container != NULL);
g_return_if_fail (GTK_IS_PIXMAP_MENU_ITEM (container));
g_return_if_fail (callback != NULL);
menu_item = GTK_PIXMAP_MENU_ITEM (container);
if (menu_item->pixmap)
(* callback) (menu_item->pixmap, callback_data);
GTK_CONTAINER_CLASS(parent_class)->forall(container,include_internals,
callback,callback_data);
}
static void
gtk_pixmap_menu_item_size_request (GtkWidget *widget,
GtkRequisition *requisition)
{
GtkPixmapMenuItem *menu_item;
GtkRequisition req = {0, 0};
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_MENU_ITEM (widget));
g_return_if_fail (requisition != NULL);
GTK_WIDGET_CLASS(parent_class)->size_request(widget,requisition);
menu_item = GTK_PIXMAP_MENU_ITEM (widget);
if (menu_item->pixmap)
gtk_widget_size_request(menu_item->pixmap, &req);
requisition->height = MAX(req.height + GTK_CONTAINER(widget)->border_width + BORDER_SPACING, (unsigned int) requisition->height);
requisition->width += (req.width + GTK_CONTAINER(widget)->border_width + BORDER_SPACING);
}
static void
gtk_pixmap_menu_item_remove (GtkContainer *container,
GtkWidget *child)
{
GtkBin *bin;
gboolean widget_was_visible;
g_return_if_fail (container != NULL);
g_return_if_fail (GTK_IS_PIXMAP_MENU_ITEM (container));
g_return_if_fail (child != NULL);
g_return_if_fail (GTK_IS_WIDGET (child));
bin = GTK_BIN (container);
g_return_if_fail ((bin->child == child ||
(GTK_PIXMAP_MENU_ITEM(container)->pixmap == child)));
widget_was_visible = GTK_WIDGET_VISIBLE (child);
gtk_widget_unparent (child);
if (bin->child == child)
bin->child = NULL;
else {
GTK_PIXMAP_MENU_ITEM(container)->pixmap = NULL;
changed_have_pixmap_status(GTK_PIXMAP_MENU_ITEM(container));
}
if (widget_was_visible)
gtk_widget_queue_resize (GTK_WIDGET (container));
}
/* important to only call this if there was actually a _change_ in pixmap == NULL */
static void
changed_have_pixmap_status (GtkPixmapMenuItem *menu_item)
{
if (menu_item->pixmap != NULL) {
GTK_PIXMAP_MENU_ITEM_GET_CLASS(menu_item)->have_pixmap_count += 1;
if (GTK_PIXMAP_MENU_ITEM_GET_CLASS(menu_item)->have_pixmap_count == 1) {
/* Install pixmap toggle size */
GTK_MENU_ITEM_GET_CLASS(menu_item)->toggle_size = MAX(GTK_PIXMAP_MENU_ITEM_GET_CLASS(menu_item)->orig_toggle_size, PMAP_WIDTH);
}
} else {
GTK_PIXMAP_MENU_ITEM_GET_CLASS(menu_item)->have_pixmap_count -= 1;
if (GTK_PIXMAP_MENU_ITEM_GET_CLASS(menu_item)->have_pixmap_count == 0) {
/* Install normal toggle size */
GTK_MENU_ITEM_GET_CLASS(menu_item)->toggle_size = GTK_PIXMAP_MENU_ITEM_GET_CLASS(menu_item)->orig_toggle_size;
}
}
/* Note that we actually need to do this for _all_ GtkPixmapMenuItem
whenever the klass->toggle_size changes; but by doing it anytime
this function is called, we get the same effect, just because of
how the preferences option to show pixmaps works. Bogus, broken.
*/
if (GTK_WIDGET_VISIBLE(GTK_WIDGET(menu_item)))
gtk_widget_queue_resize(GTK_WIDGET(menu_item));
}
/* Added by JACS */
GtkWidget*
gtk_pixmap_menu_item_new_with_label (const gchar *label, GtkWidget** labelWidget)
{
GtkWidget *menu_item;
GtkWidget *accel_label;
menu_item = gtk_pixmap_menu_item_new ();
accel_label = gtk_accel_label_new (label);
if (labelWidget)
*labelWidget = accel_label;
gtk_misc_set_alignment (GTK_MISC (accel_label), 0.0, 0.5);
gtk_container_add (GTK_CONTAINER (menu_item), accel_label);
gtk_accel_label_set_accel_widget (GTK_ACCEL_LABEL (accel_label), menu_item);
gtk_widget_show (accel_label);
return menu_item;
}
////// END CODE ADAPTED FROM GTKPIXMAPMENUITEM.C IN LIBGNOMEUI //////

77
src/gtk1/settings.cpp
View File

@ -69,6 +69,7 @@ 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;
@ -82,6 +83,7 @@ void wxSystemSettings::Done()
delete g_systemHighlightTextColour;
delete g_systemListBoxColour;
delete g_systemFont;
delete g_systemBtnTextColour;
}
wxColour wxSystemSettings::GetSystemColour( int index )
@ -99,6 +101,34 @@ wxColour wxSystemSettings::GetSystemColour( int index )
case wxSYS_COLOUR_BTNFACE:
case wxSYS_COLOUR_3DLIGHT:
{
if (!g_systemBtnFaceColour)
{
GtkWidget *widget = gtk_button_new();
GtkStyle *def = gtk_rc_get_style( widget );
if (!def)
def = gtk_widget_get_default_style();
if (def)
{
int red = def->bg[GTK_STATE_NORMAL].red;
int green = def->bg[GTK_STATE_NORMAL].green;
int blue = def->bg[GTK_STATE_NORMAL].blue;
g_systemBtnFaceColour =
new wxColour( red >> SHIFT,
green >> SHIFT,
blue >> SHIFT );
}
else
{
g_systemBtnFaceColour =
new wxColour( 0 >> SHIFT,
0 >> SHIFT,
0x9c40 >> SHIFT );
}
gtk_widget_destroy( widget );
}
return *g_systemBtnFaceColour;
/*
if (!g_systemBtnFaceColour)
{
g_systemBtnFaceColour =
@ -107,14 +137,29 @@ wxColour wxSystemSettings::GetSystemColour( int index )
0xd6d6 >> SHIFT );
}
return *g_systemBtnFaceColour;
*/
}
case wxSYS_COLOUR_WINDOW:
{
return *wxWHITE;
}
case wxSYS_COLOUR_3DDKSHADOW:
{
return *wxBLACK;
}
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(faceColour.Red() * 0.666,
faceColour.Green() * 0.666,
faceColour.Blue() * 0.666);
}
/*
if (!g_systemBtnShadowColour)
{
g_systemBtnShadowColour =
@ -122,10 +167,14 @@ wxColour wxSystemSettings::GetSystemColour( int index )
0x7530 >> SHIFT,
0x7530 >> SHIFT );
}
*/
return *g_systemBtnShadowColour;
}
case wxSYS_COLOUR_BTNHIGHLIGHT:
case wxSYS_COLOUR_3DHIGHLIGHT:
//case wxSYS_COLOUR_BTNHIGHLIGHT:
{
return * wxWHITE;
/* I think this should normally be white (JACS 8/2000)
if (!g_systemBtnHighlightColour)
{
g_systemBtnHighlightColour =
@ -134,6 +183,7 @@ wxColour wxSystemSettings::GetSystemColour( int index )
0xea60 >> SHIFT );
}
return *g_systemBtnHighlightColour;
*/
}
case wxSYS_COLOUR_HIGHLIGHT:
{
@ -196,7 +246,30 @@ wxColour wxSystemSettings::GetSystemColour( int index )
case wxSYS_COLOUR_BTNTEXT:
case wxSYS_COLOUR_INFOTEXT:
{
return *wxBLACK;
if (!g_systemBtnTextColour)
{
GtkWidget *widget = gtk_button_new();
GtkStyle *def = gtk_rc_get_style( widget );
if (!def)
def = gtk_widget_get_default_style();
if (def)
{
int red = def->fg[GTK_STATE_NORMAL].red;
int green = def->fg[GTK_STATE_NORMAL].green;
int blue = def->fg[GTK_STATE_NORMAL].blue;
g_systemBtnTextColour =
new wxColour( red >> SHIFT,
green >> SHIFT,
blue >> SHIFT );
}
else
{
g_systemBtnTextColour =
new wxColour(0, 0, 0);
}
gtk_widget_destroy( widget );
}
return *g_systemBtnTextColour;
}
case wxSYS_COLOUR_HIGHLIGHTTEXT:
{

55
utils/dialoged/src/Makefile
View File

@ -1,51 +1,22 @@
# Generated automatically from Makefile.in by configure.
#
# File: Makefile
# Author: Robert Roebling
# Created: 1999
# File: makefile.unx
# Author: Julian Smart
# Created: 1998
# Updated:
# Copyright: (c) 1998 Robert Roebling
# Copyright: (c) 1998 Julian Smart
#
# Makefile for Dialog Editor (GTK version)
#
# This makefile requires wxWindows/GTK to be
# installed (possibly using "make install")
# on your system.
# "%W% %G%"
#
# Makefile for Tex2RTF (Unix)
CC = g++
top_srcdir = ../../..
top_builddir = ../../..
program_dir = utils/dialoged/src
DialogEd: dialoged.o dlghndlr.o edlist.o edtree.o reseditr.o reswrite.o \
symbtabl.o winprop.o winstyle.o
$(CC) -o DialogEd \
dialoged.o dlghndlr.o edlist.o edtree.o reseditr.o reswrite.o \
symbtabl.o winprop.o winstyle.o `wx-config --libs`
PROGRAM=DialogEd
dialoged.o: dialoged.cpp
$(CC) `wx-config --cflags` -c dialoged.cpp
OBJECTS = dialoged.o dlghndlr.o edlist.o edtree.o reseditr.o reswrite.o symbtabl.o winprop.o winstyle.o
dlghndlr.o: dlghndlr.cpp
$(CC) `wx-config --cflags` -c dlghndlr.cpp
include ../../../src/makeprog.env
edlist.o: edlist.cpp
$(CC) `wx-config --cflags` -c edlist.cpp
edtree.o: edtree.cpp
$(CC) `wx-config --cflags` -c edtree.cpp
reseditr.o: reseditr.cpp
$(CC) `wx-config --cflags` -c reseditr.cpp
reswrite.o: reswrite.cpp
$(CC) `wx-config --cflags` -c reswrite.cpp
symbtabl.o: symbtabl.cpp
$(CC) `wx-config --cflags` -c symbtabl.cpp
winprop.o: winprop.cpp
$(CC) `wx-config --cflags` -c winprop.cpp
winstyle.o: winstyle.cpp
$(CC) `wx-config --cflags` -c winstyle.cpp
clean:
rm -f *.o DialogEd