projects / packages / libreoffice.git / blame
| Commit | Line | Data |
|---|---|---|
| d7335463 | 1 | ? vcl/util/vcl-gcc3.map |
| 2 | Index: vcl/source/src/msgbox.bmp | |
| 3 | =================================================================== | |
| 4 | RCS file: /cvs/gsl/vcl/source/src/msgbox.bmp,v | |
| 5 | retrieving revision 1.1.1.1 | |
| 6 | diff -u -p -u -r1.1.1.1 msgbox.bmp | |
| 7 | Binary files /tmp/cvsM6aind and msgbox.bmp differ | |
| 8 | Index: vcl/unx/source/gdi/getstyle/getstyle-gnome.c | |
| 9 | =================================================================== | |
| 10 | RCS file: /cvs/gsl/vcl/unx/source/gdi/getstyle/getstyle-gnome.c,v | |
| 11 | retrieving revision 1.5 | |
| 12 | diff -u -p -u -r1.5 getstyle-gnome.c | |
| 13 | --- vcl/unx/source/gdi/getstyle/getstyle-gnome.c 27 Mar 2003 17:58:57 -0000 1.5 | |
| 14 | +++ vcl/unx/source/gdi/getstyle/getstyle-gnome.c 13 May 2003 11:28:48 -0000 | |
| 15 | @@ -139,6 +139,25 @@ void printColor( int eStyle, GdkColor* p | |
| 16 | pColor->blue/256 ); | |
| 17 | } | |
| 18 | ||
| 19 | +/* We special case menu items because they use a "menuitem" detail field when | |
| 20 | + * calling gtk_paint_flat_box(). | |
| 21 | + */ | |
| 22 | +void | |
| 23 | +printMenuColors (void) | |
| 24 | +{ | |
| 25 | + GtkWidget *item; | |
| 26 | + GtkStyle *style; | |
| 27 | + | |
| 28 | + item = gtk_menu_item_new (); | |
| 29 | + gtk_widget_ensure_style (item); | |
| 30 | + | |
| 31 | + style = gtk_rc_get_style (item); | |
| 32 | + printColor (MenuHighlightColor, &style->bg[GTK_STATE_PRELIGHT]); | |
| 33 | + printColor (MenuHighlightTextColor, &style->fg[GTK_STATE_PRELIGHT]); | |
| 34 | + | |
| 35 | + gtk_widget_destroy (item); | |
| 36 | +} | |
| 37 | + | |
| 38 | void printFont( int eStyle, PangoFontDescription* pFont ) | |
| 39 | { | |
| 40 | PangoWeight eWeight; | |
| 41 | @@ -194,6 +213,8 @@ void printVCLStyle( GtkWidget* widget ) | |
| 42 | printColor( HighlightTextColor, &pStyle->text[GTK_STATE_SELECTED] ); | |
| 43 | printColor( FieldColor, &pStyle->base[GTK_STATE_NORMAL] ); | |
| 44 | printColor( WindowColor, &pStyle->base[GTK_STATE_NORMAL] ); | |
| 45 | + printColor( CheckedColor, &pStyle->bg[GTK_STATE_ACTIVE] ); | |
| 46 | + printMenuColors(); | |
| 47 | ||
| 48 | printFont( UIFont, pStyle->font_desc ); | |
| 49 | ||
| 50 | @@ -299,8 +319,10 @@ int main (int argc, char **argv) | |
| 51 | #endif | |
| 52 | ||
| 53 | /* realize the widgets, do not show it to avoid flicker */ | |
| 54 | - gtk_widget_realize(mainwin); | |
| 55 | - gtk_widget_realize(toolbar); | |
| 56 | + gtk_widget_ensure_style( mainwin ); | |
| 57 | + gtk_widget_ensure_style( toolbar ); | |
| 58 | + gtk_widget_realize( mainwin ); | |
| 59 | + gtk_widget_realize( toolbar ); | |
| 60 | ||
| 61 | /* Enter the main event loop, and wait for user interaction */ | |
| 62 | gtk_main (); | |
| 10ddbf9c AM |
63 | ;Index: vcl/unx/source/gdi/getstyle/makefile.mk |
| 64 | ;=================================================================== | |
| 65 | ;RCS file: /cvs/gsl/vcl/unx/source/gdi/getstyle/makefile.mk,v | |
| 66 | ;retrieving revision 1.3 | |
| 67 | ;diff -u -p -u -r1.3 makefile.mk | |
| 68 | ;--- vcl/unx/source/gdi/getstyle/makefile.mk 27 Mar 2003 17:58:57 -0000 1.3 | |
| 69 | ;+++ vcl/unx/source/gdi/getstyle/makefile.mk 13 May 2003 11:28:48 -0000 | |
| 70 | ;@@ -95,10 +95,8 @@ HASGNOME2=TRUE | |
| 71 | ; | |
| 72 | ; ALLTAR: $(BIN)$/getstyle-gnome | |
| 73 | ; | |
| 74 | ;-.IF "$(HASGNOME2)"=="TRUE" | |
| 75 | ;-$(BIN)$/getstyle-gnome: | |
| 76 | ;- +$(COPY) $(GETSTYLE_GNOME) $@ | |
| 77 | ;-.ELSE | |
| 78 | ;-$(BIN)$/getstyle-gnome: | |
| 79 | ;- +$(TOUCH) $@ | |
| 80 | ;-.ENDIF | |
| 81 | ;+$(BIN)$/getstyle-gnome: getstyle-gnome.c | |
| 82 | ;+ setenv UGLY_HACK_INDEED "$/LD_LIBRARY_PATH"; \ | |
| 83 | ;+ unsetenv LD_LIBRARY_PATH; \ | |
| 84 | ;+ $(CC) `pkg-config --cflags gtk+-2.0` `pkg-config --libs gtk+-2.0` -o $(BIN)$/getstyle-gnome getstyle-gnome.c; \ | |
| 85 | ;+ setenv LD_LIBRARY_PATH "$/UGLY_HACK_INDEED" |