Replaced various '#define' with actual strings - part 3

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/15/head
Michele Calgaro 1 year ago
parent 5af2f0adc5
commit 432b7dc374
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF

@ -832,12 +832,12 @@ void drawToolbar(GdkWindow* window, GtkStyle* style, GtkStateType state, int x,
else else
painter.fillRect(0, 0, w1, h1, tqApp->palette().active().brush(TQColorGroup::Background)); painter.fillRect(0, 0, w1, h1, tqApp->palette().active().brush(TQColorGroup::Background));
tqApp->style().tqdrawPrimitive(TQStyle::PE_PanelDockWindow, &painter, tqApp->style().drawPrimitive(TQStyle::PE_PanelDockWindow, &painter,
TQRect(0,0,w1,h1), tqApp->palette().active(),sflags); TQRect(0,0,w1,h1), tqApp->palette().active(),sflags);
if (isKeramik) if (isKeramik)
{ {
tqApp->style().tqdrawPrimitive(TQStyle::PE_DockWindowSeparator, &painter, tqApp->style().drawPrimitive(TQStyle::PE_DockWindowSeparator, &painter,
TQRect(0,0,w1,h1), tqApp->palette().active(),sflags); TQRect(0,0,w1,h1), tqApp->palette().active(),sflags);
} }
@ -887,7 +887,7 @@ void drawMenubar(GdkWindow* window, GtkStyle* style, GtkStateType state, int x,
else else
painter.fillRect(0, 0, w1, h1, tqApp->palette().active().brush(TQColorGroup::Background)); painter.fillRect(0, 0, w1, h1, tqApp->palette().active().brush(TQColorGroup::Background));
tqApp->style().tqdrawPrimitive(TQStyle::PE_PanelMenuBar, &painter, tqApp->style().drawPrimitive(TQStyle::PE_PanelMenuBar, &painter,
TQRect(0,0,w1,h1), tqApp->palette().active(),sflags); TQRect(0,0,w1,h1), tqApp->palette().active(),sflags);
bitBlt(&p, 0, 0, &pixmap, 0, 0, w, h); bitBlt(&p, 0, 0, &pixmap, 0, 0, w, h);
@ -996,7 +996,7 @@ void drawLineEdit(GdkWindow* window, GtkStyle* style, GtkStateType state, int ha
sflags |= TQStyle::Style_HasFocus; sflags |= TQStyle::Style_HasFocus;
painter.fillRect(0, 0, w, h, tqApp->palette().active().base()); painter.fillRect(0, 0, w, h, tqApp->palette().active().base());
tqApp->style().tqdrawPrimitive(TQStyle::PE_PanelLineEdit, &painter, TQRect(0, 0, w, h), tqApp->palette().active(), sflags, TQStyleOption(1,1)); tqApp->style().drawPrimitive(TQStyle::PE_PanelLineEdit, &painter, TQRect(0, 0, w, h), tqApp->palette().active(), sflags, TQStyleOption(1,1));
GdkPixmap* pix = gdk_pixmap_foreign_new(pixmap.handle()); GdkPixmap* pix = gdk_pixmap_foreign_new(pixmap.handle());
gdk_draw_drawable(window, style->bg_gc[state], pix, 0, 0, x, y, w, h); gdk_draw_drawable(window, style->bg_gc[state], pix, 0, 0, x, y, w, h);
@ -1023,7 +1023,7 @@ void drawFrame(GdkWindow* window, GtkStyle* style, GtkStateType state, GtkShadow
else else
painter.fillRect(0, 0, w, h, tqApp->palette().active().brush(TQColorGroup::Background)); painter.fillRect(0, 0, w, h, tqApp->palette().active().brush(TQColorGroup::Background));
tqApp->style().tqdrawPrimitive(TQStyle::PE_Panel, &painter, TQRect(0, 0, w, h), tqApp->palette().active(), sflags, TQStyleOption(2,2) ); tqApp->style().drawPrimitive(TQStyle::PE_Panel, &painter, TQRect(0, 0, w, h), tqApp->palette().active(), sflags, TQStyleOption(2,2) );
GdkPixmap* pix = gdk_pixmap_foreign_new(pixmap.handle()); GdkPixmap* pix = gdk_pixmap_foreign_new(pixmap.handle());
gdk_draw_drawable(window, style->bg_gc[state], pix, 0, 0, x, y, w, h); gdk_draw_drawable(window, style->bg_gc[state], pix, 0, 0, x, y, w, h);
@ -1117,7 +1117,7 @@ void drawMenuCheck(GdkWindow* window, GtkStyle* style, GtkStateType state, int x
painter.fillRect(0, 0, w, h, TQBrush(TQColor(255,255,255), *backgroundTile)); painter.fillRect(0, 0, w, h, TQBrush(TQColor(255,255,255), *backgroundTile));
else else
painter.fillRect(0, 0, w, h, tqApp->palette().active().brush(TQColorGroup::Background)); painter.fillRect(0, 0, w, h, tqApp->palette().active().brush(TQColorGroup::Background));
tqApp->style().tqdrawPrimitive(TQStyle::PE_CheckMark, &painter, TQRect(0, 0, w, h), tqApp->palette().active(), sflags); tqApp->style().drawPrimitive(TQStyle::PE_CheckMark, &painter, TQRect(0, 0, w, h), tqApp->palette().active(), sflags);
GdkPixmap* pix = gdk_pixmap_foreign_new(pixmap.handle()); GdkPixmap* pix = gdk_pixmap_foreign_new(pixmap.handle());
gdk_draw_drawable(window, style->bg_gc[state], pix, 0, 0, x, y, w, h); gdk_draw_drawable(window, style->bg_gc[state], pix, 0, 0, x, y, w, h);
@ -1186,7 +1186,7 @@ void drawScrollBarSlider(GdkWindow* window, GtkStyle* style, GtkStateType state,
if (orientation == GTK_ORIENTATION_HORIZONTAL) if (orientation == GTK_ORIENTATION_HORIZONTAL)
sflags |= TQStyle::Style_Horizontal; sflags |= TQStyle::Style_Horizontal;
tqApp->style().tqdrawPrimitive(TQStyle::PE_ScrollBarSlider, &painter, TQRect(0,0,wCorrected,hCorrected), tqApp->palette().active(), sflags); tqApp->style().drawPrimitive(TQStyle::PE_ScrollBarSlider, &painter, TQRect(0,0,wCorrected,hCorrected), tqApp->palette().active(), sflags);
// The domino style doesn't draw the entire slider in PE_ScrollBarSlider // The domino style doesn't draw the entire slider in PE_ScrollBarSlider
// We have to draw PE_ScrollBarAddPage and PE_ScrollBarSubPage and piece the bits together // We have to draw PE_ScrollBarAddPage and PE_ScrollBarSubPage and piece the bits together
@ -1210,11 +1210,11 @@ void drawScrollBarSlider(GdkWindow* window, GtkStyle* style, GtkStateType state,
} }
TQPainter dominoPainter(&leftPix); TQPainter dominoPainter(&leftPix);
tqApp->style().tqdrawPrimitive(TQStyle::PE_ScrollBarSubPage, &dominoPainter, leftRect, tqApp->palette().active(), sflags); tqApp->style().drawPrimitive(TQStyle::PE_ScrollBarSubPage, &dominoPainter, leftRect, tqApp->palette().active(), sflags);
dominoPainter.end(); dominoPainter.end();
dominoPainter.begin(&rightPix); dominoPainter.begin(&rightPix);
tqApp->style().tqdrawPrimitive(TQStyle::PE_ScrollBarAddPage, &dominoPainter, rightRect, tqApp->palette().active(), sflags); tqApp->style().drawPrimitive(TQStyle::PE_ScrollBarAddPage, &dominoPainter, rightRect, tqApp->palette().active(), sflags);
if (orientation == GTK_ORIENTATION_HORIZONTAL) if (orientation == GTK_ORIENTATION_HORIZONTAL)
{ {
@ -1444,7 +1444,7 @@ void drawSplitter(GdkWindow* window, GtkStyle* style, GtkStateType state, int or
if (orientation != GTK_ORIENTATION_HORIZONTAL) sflags |= TQStyle::Style_Horizontal; if (orientation != GTK_ORIENTATION_HORIZONTAL) sflags |= TQStyle::Style_Horizontal;
painter.fillRect(0, 0, w, h, tqApp->palette().active().brush(TQColorGroup::Background)); painter.fillRect(0, 0, w, h, tqApp->palette().active().brush(TQColorGroup::Background));
tqApp->style().tqdrawPrimitive(TQStyle::PE_Splitter, &painter, TQRect(0,0,w,h), tqApp->palette().active(), sflags); tqApp->style().drawPrimitive(TQStyle::PE_Splitter, &painter, TQRect(0,0,w,h), tqApp->palette().active(), sflags);
GdkPixmap* pix = gdk_pixmap_foreign_new(pixmap.handle()); GdkPixmap* pix = gdk_pixmap_foreign_new(pixmap.handle());
gdk_draw_drawable(window, style->bg_gc[state], pix, 0, 0, x, y, w, h); gdk_draw_drawable(window, style->bg_gc[state], pix, 0, 0, x, y, w, h);
@ -1469,7 +1469,7 @@ void drawTabFrame(GdkWindow* window, GtkStyle* style, GtkStateType state, int x,
painter.fillRect(0, 0, w, h, TQBrush(TQColor(255,255,255), *backgroundTile)); painter.fillRect(0, 0, w, h, TQBrush(TQColor(255,255,255), *backgroundTile));
else else
painter.fillRect(0, 0, w, h, tqApp->palette().active().brush(TQColorGroup::Background)); painter.fillRect(0, 0, w, h, tqApp->palette().active().brush(TQColorGroup::Background));
tqApp->style().tqdrawPrimitive(TQStyle::PE_PanelTabWidget, &painter, TQRect(0,0,w,h), tqApp->palette().active(), sflags, opt); tqApp->style().drawPrimitive(TQStyle::PE_PanelTabWidget, &painter, TQRect(0,0,w,h), tqApp->palette().active(), sflags, opt);
GdkPixmap* pix = gdk_pixmap_foreign_new(pixmap.handle()); GdkPixmap* pix = gdk_pixmap_foreign_new(pixmap.handle());
gdk_draw_drawable(window, style->bg_gc[state], pix, 0, 0, x, y, w, h); gdk_draw_drawable(window, style->bg_gc[state], pix, 0, 0, x, y, w, h);
@ -1490,7 +1490,7 @@ void drawTabFrame(GdkWindow* window, GtkStyle* style, GtkStateType state, int x,
painter1.fillRect(0, 0, tw, th, tqApp->palette().active().brush(TQColorGroup::Background)); painter1.fillRect(0, 0, tw, th, tqApp->palette().active().brush(TQColorGroup::Background));
tqApp->style().tqdrawPrimitive(TQStyle::PE_TabBarBase, &painter1, TQRect(0, 0, tw, th), tqApp->palette().active(), sflags, TQStyleOption(1,1)); tqApp->style().drawPrimitive(TQStyle::PE_TabBarBase, &painter1, TQRect(0, 0, tw, th), tqApp->palette().active(), sflags, TQStyleOption(1,1));
if (pos == GTK_POS_BOTTOM) if (pos == GTK_POS_BOTTOM)
{ {
TQWMatrix m; TQWMatrix m;
@ -1525,7 +1525,7 @@ void drawMenu(GdkWindow* window, GtkStyle* style, GtkStateType state, int x, int
painter.fillRect(0, 0, w, h, TQBrush(TQColor(255,255,255), *backgroundTile)); painter.fillRect(0, 0, w, h, TQBrush(TQColor(255,255,255), *backgroundTile));
else else
painter.fillRect(0, 0, w, h, tqApp->palette().active().brush(TQColorGroup::Background)); painter.fillRect(0, 0, w, h, tqApp->palette().active().brush(TQColorGroup::Background));
tqApp->style().tqdrawPrimitive(TQStyle::PE_PanelPopup, &painter, TQRect(0,0,w,h), tqApp->palette().active(), sflags); tqApp->style().drawPrimitive(TQStyle::PE_PanelPopup, &painter, TQRect(0,0,w,h), tqApp->palette().active(), sflags);
GdkPixmap* pix = gdk_pixmap_foreign_new(pixmap.handle()); GdkPixmap* pix = gdk_pixmap_foreign_new(pixmap.handle());
gdk_draw_drawable(window, style->bg_gc[state], pix, 0, 0, x, y, w, h); gdk_draw_drawable(window, style->bg_gc[state], pix, 0, 0, x, y, w, h);
@ -1661,7 +1661,7 @@ void drawSpinButton(GdkWindow * window, GtkStyle * style, GtkStateType state, in
TQStyle::SFlags sflags = stateToSFlags(state); TQStyle::SFlags sflags = stateToSFlags(state);
painter.fillRect(0, 0, w, h, tqApp->palette().active().brush(TQColorGroup::Background)); painter.fillRect(0, 0, w, h, tqApp->palette().active().brush(TQColorGroup::Background));
tqApp->style().tqdrawPrimitive((direction ? TQStyle::PE_SpinWidgetDown : TQStyle::PE_SpinWidgetUp), &painter, TQRect(0,0,w,h), tqApp->palette().active(), sflags); tqApp->style().drawPrimitive((direction ? TQStyle::PE_SpinWidgetDown : TQStyle::PE_SpinWidgetUp), &painter, TQRect(0,0,w,h), tqApp->palette().active(), sflags);
GdkPixmap* pix = gdk_pixmap_foreign_new(pixmap.handle()); GdkPixmap* pix = gdk_pixmap_foreign_new(pixmap.handle());
gdk_draw_drawable(window, style->bg_gc[state], pix, 0, 0, x, y, w, h); gdk_draw_drawable(window, style->bg_gc[state], pix, 0, 0, x, y, w, h);
@ -1682,7 +1682,7 @@ void drawListHeader(GdkWindow* window, GtkStyle* style, GtkStateType state, int
TQStyle::SFlags sflags = stateToSFlags(state) | TQStyle::Style_Horizontal; TQStyle::SFlags sflags = stateToSFlags(state) | TQStyle::Style_Horizontal;
painter.fillRect(0, 0, w, h, tqApp->palette().active().brush(TQColorGroup::Background)); painter.fillRect(0, 0, w, h, tqApp->palette().active().brush(TQColorGroup::Background));
tqApp->style().tqdrawPrimitive(TQStyle::PE_HeaderSection, &painter, TQRect(0,0,w,h), tqApp->palette().active(), sflags); tqApp->style().drawPrimitive(TQStyle::PE_HeaderSection, &painter, TQRect(0,0,w,h), tqApp->palette().active(), sflags);
GdkPixmap* pix = gdk_pixmap_foreign_new(pixmap.handle()); GdkPixmap* pix = gdk_pixmap_foreign_new(pixmap.handle());
gdk_draw_drawable(window, style->bg_gc[state], pix, 0, 0, x, y, w, h); gdk_draw_drawable(window, style->bg_gc[state], pix, 0, 0, x, y, w, h);
@ -1858,7 +1858,7 @@ void drawArrow(GdkWindow* window, GtkStyle* style, GtkStateType state, GtkArrowT
else else
painter.fillRect(0, 0, w, h, tqApp->palette().active().brush(TQColorGroup::Background)); painter.fillRect(0, 0, w, h, tqApp->palette().active().brush(TQColorGroup::Background));
tqApp->style().tqdrawPrimitive(element, &painter, TQRect(0,0,w,h), tqApp->palette().active(), sflags); tqApp->style().drawPrimitive(element, &painter, TQRect(0,0,w,h), tqApp->palette().active(), sflags);
GdkPixmap* pix = gdk_pixmap_foreign_new(pixmap.handle()); GdkPixmap* pix = gdk_pixmap_foreign_new(pixmap.handle());
gdk_draw_drawable(window, style->bg_gc[state], pix, 0, 0, x, y, w, h); gdk_draw_drawable(window, style->bg_gc[state], pix, 0, 0, x, y, w, h);
@ -1878,7 +1878,7 @@ void drawFocusRect(GdkWindow * window, GtkStyle * style, int x, int y, int w, in
TQColor bg(tqApp->palette().active().background()); TQColor bg(tqApp->palette().active().background());
painter.fillRect(0,0,w,h,bg); painter.fillRect(0,0,w,h,bg);
tqApp->style().tqdrawPrimitive(TQStyle::PE_FocusRect, &painter, TQRect(0,0,w,h), tqApp->palette().active(), TQStyle::Style_Default, TQStyleOption(bg)); tqApp->style().drawPrimitive(TQStyle::PE_FocusRect, &painter, TQRect(0,0,w,h), tqApp->palette().active(), TQStyle::Style_Default, TQStyleOption(bg));
GdkPixmap* pix = gdk_pixmap_foreign_new(pixmap.handle()); GdkPixmap* pix = gdk_pixmap_foreign_new(pixmap.handle());
gdk_draw_drawable(window, style->bg_gc[GTK_STATE_NORMAL], pix, 0, 0, x, y, w, h); gdk_draw_drawable(window, style->bg_gc[GTK_STATE_NORMAL], pix, 0, 0, x, y, w, h);

Loading…
Cancel
Save