summaryrefslogtreecommitdiffstats
path: root/chalk
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2014-08-27 22:41:02 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2014-08-27 22:41:02 +0900
commit5d6fa0caf6ef37c348404275ce7ec35454c87bd3 (patch)
tree4533c1735f06c9a43104ec65a8e49f53b1d40f09 /chalk
parentebea843b5c693eaef2f601d3739242ed6b8db02c (diff)
downloadkoffice-5d6fa0caf6ef37c348404275ce7ec35454c87bd3.tar.gz
koffice-5d6fa0caf6ef37c348404275ce7ec35454c87bd3.zip
Fixed warning messages when starting Chalk. This resolves bug 1976.
Diffstat (limited to 'chalk')
-rw-r--r--chalk/plugins/tools/defaulttools/kis_tool_brush.cc2
-rw-r--r--chalk/ui/kis_view.cc2
2 files changed, 2 insertions, 2 deletions
diff --git a/chalk/plugins/tools/defaulttools/kis_tool_brush.cc b/chalk/plugins/tools/defaulttools/kis_tool_brush.cc
index 86413587..7c83a36b 100644
--- a/chalk/plugins/tools/defaulttools/kis_tool_brush.cc
+++ b/chalk/plugins/tools/defaulttools/kis_tool_brush.cc
@@ -154,7 +154,7 @@ TQWidget* KisToolBrush::createOptionWidget(TQWidget* parent)
m_chkDirect->setChecked(true);
connect(m_chkDirect, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(slotSetPaintingMode(int)));
- m_optionLayout = new TQGridLayout(widget, 3, 2, 0, 6);
+ m_optionLayout = new TQGridLayout(NULL, 3, 2, 0, 6);
TQ_CHECK_PTR(m_optionLayout);
super::addOptionWidgetLayout(m_optionLayout);
diff --git a/chalk/ui/kis_view.cc b/chalk/ui/kis_view.cc
index 79575357..569188d9 100644
--- a/chalk/ui/kis_view.cc
+++ b/chalk/ui/kis_view.cc
@@ -945,7 +945,7 @@ void KisView::updateTQPaintDeviceCanvas(const TQRect& imageRect)
TQPainter gc;
- if (gc.begin(&m_canvasPixmap)) {
+ if (!m_canvasPixmap.isNull() && gc.begin(&m_canvasPixmap)) {
KisImageSP img = currentImg();