From: vsr Date: Tue, 24 Jul 2007 12:59:09 +0000 (+0000) Subject: *** empty log message *** X-Git-Tag: qt4_porting_delivery_220807~77 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=1e74d30304bff993e6357eba882e7b25a4271b20;p=modules%2Fgui.git *** empty log message *** --- diff --git a/src/LogWindow/LogWindow.cxx b/src/LogWindow/LogWindow.cxx index 77cfb6aeb..1b1a96319 100755 --- a/src/LogWindow/LogWindow.cxx +++ b/src/LogWindow/LogWindow.cxx @@ -87,7 +87,7 @@ static QString plainText( const QString& richText ) \param parent parent widget */ LogWindow::LogWindow( QWidget* parent ) -: QFrame( parent ), +: QWidget( parent ), SUIT_PopupClient() { SUIT_ResourceMgr* resMgr = SUIT_Session::session()->resourceMgr(); @@ -101,7 +101,7 @@ LogWindow::LogWindow( QWidget* parent ) myView->viewport()->installEventFilter( this ); QVBoxLayout* main = new QVBoxLayout( this ); - main->setMargin( 5 ); + main->setMargin( 0 ); main->addWidget( myView ); myBannerSize = 0; @@ -178,7 +178,7 @@ bool LogWindow::eventFilter( QObject* o, QEvent* e ) contextMenuRequest( (QContextMenuEvent*)e ); return true; } - return QFrame::eventFilter( o, e ); + return QWidget::eventFilter( o, e ); } /*! diff --git a/src/LogWindow/LogWindow.h b/src/LogWindow/LogWindow.h index 326425bd7..3461d0a68 100755 --- a/src/LogWindow/LogWindow.h +++ b/src/LogWindow/LogWindow.h @@ -38,7 +38,7 @@ #include -#include +#include #include #include @@ -49,7 +49,7 @@ class QAction; class QTextEdit; -class LOGWINDOW_EXPORT LogWindow : public QFrame, public SUIT_PopupClient +class LOGWINDOW_EXPORT LogWindow : public QWidget, public SUIT_PopupClient { Q_OBJECT diff --git a/src/PyConsole/PyConsole_Console.cxx b/src/PyConsole/PyConsole_Console.cxx index 07cdfb544..85df7307a 100644 --- a/src/PyConsole/PyConsole_Console.cxx +++ b/src/PyConsole/PyConsole_Console.cxx @@ -46,7 +46,7 @@ \param interp python interpreter */ PyConsole_Console::PyConsole_Console( QWidget* parent, PyConsole_Interp* interp ) -: QFrame( parent ), +: QWidget( parent ), myEditor( 0 ) { // create python interpreter @@ -59,7 +59,7 @@ PyConsole_Console::PyConsole_Console( QWidget* parent, PyConsole_Interp* interp // create editor console QVBoxLayout* lay = new QVBoxLayout( this ); - lay->setMargin( 5 ); + lay->setMargin( 0 ); myEditor = new PyConsole_Editor( myInterp, this ); myEditor->viewport()->installEventFilter( this ); lay->addWidget( myEditor ); @@ -163,7 +163,7 @@ bool PyConsole_Console::eventFilter( QObject* o, QEvent* e ) contextMenuRequest( (QContextMenuEvent*)e ); return true; } - return QFrame::eventFilter( o, e ); + return QWidget::eventFilter( o, e ); } /*! diff --git a/src/PyConsole/PyConsole_Console.h b/src/PyConsole/PyConsole_Console.h index 17e1c73b6..ed1203b83 100644 --- a/src/PyConsole/PyConsole_Console.h +++ b/src/PyConsole/PyConsole_Console.h @@ -26,13 +26,13 @@ #include "PyConsole.h" #include -#include +#include #include class PyConsole_Interp; class PyConsole_Editor; -class PYCONSOLE_EXPORT PyConsole_Console : public QFrame, public SUIT_PopupClient +class PYCONSOLE_EXPORT PyConsole_Console : public QWidget, public SUIT_PopupClient { Q_OBJECT