diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-07-24 03:10:05 -0500 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-07-24 03:10:05 -0500 |
| commit | 596c6587c8e5263027705426647b43a5105f3bcd (patch) | |
| tree | b864ce18ebbf1185a337cbbe4a817d08eac8dc57 /tqtinterface/qt4/src/widgets | |
| parent | d3f7a9d6f1b8f6e24fb49aaa8caeaa7623ae48b5 (diff) | |
| download | experimental-596c6587c8e5263027705426647b43a5105f3bcd.tar.gz experimental-596c6587c8e5263027705426647b43a5105f3bcd.zip | |
Fixed FTBFS due to prior commit
Diffstat (limited to 'tqtinterface/qt4/src/widgets')
| -rw-r--r-- | tqtinterface/qt4/src/widgets/tqmenubar.cpp | 2 | ||||
| -rw-r--r-- | tqtinterface/qt4/src/widgets/tqpopupmenu.cpp | 4 | ||||
| -rw-r--r-- | tqtinterface/qt4/src/widgets/tqtextedit.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/tqtinterface/qt4/src/widgets/tqmenubar.cpp b/tqtinterface/qt4/src/widgets/tqmenubar.cpp index c8fed6d..0a1feba 100644 --- a/tqtinterface/qt4/src/widgets/tqmenubar.cpp +++ b/tqtinterface/qt4/src/widgets/tqmenubar.cpp @@ -301,7 +301,7 @@ TQMenuBar::TQMenuBar( TQWidget *tqparent, const char *name ) TQFontMetrics fm = fontMetrics(); int h; - int gs = style().tqstyleHint(TQStyle::SH_GUIStyle); + int gs = tqstyle().tqstyleHint(TQStyle::SH_GUIStyle); if (gs == GtkStyle) { h = fm.height() + gtkItemVMargin; } else { diff --git a/tqtinterface/qt4/src/widgets/tqpopupmenu.cpp b/tqtinterface/qt4/src/widgets/tqpopupmenu.cpp index 993c065..89f525a 100644 --- a/tqtinterface/qt4/src/widgets/tqpopupmenu.cpp +++ b/tqtinterface/qt4/src/widgets/tqpopupmenu.cpp @@ -603,7 +603,7 @@ void TQPopupMenu::popup( const TQPoint &pos, int indexAtPoint ) if( tqparent == NULL ) tqparent = TQApplication::widgetAt( pos ); if( tqparent == NULL ) - tqparent = tqApp->activeWindow(); + tqparent = TQT_TQWIDGET(tqApp->activeWindow()); if( tqparent != NULL ) x11SetWindowTransient( tqparent ); } @@ -2387,7 +2387,7 @@ void TQPopupMenu::subMenuTimer() { TQPoint p; TQSize ps = popup->tqsizeHint(); // GUI Style - int gs = style().tqstyleHint(TQStyle::SH_GUIStyle); + int gs = tqstyle().tqstyleHint(TQStyle::SH_GUIStyle); int arrowHMargin, arrowVMargin; if (gs == GtkStyle) { arrowHMargin = gtkArrowHMargin; diff --git a/tqtinterface/qt4/src/widgets/tqtextedit.cpp b/tqtinterface/qt4/src/widgets/tqtextedit.cpp index e299348..c2c3141 100644 --- a/tqtinterface/qt4/src/widgets/tqtextedit.cpp +++ b/tqtinterface/qt4/src/widgets/tqtextedit.cpp @@ -1576,7 +1576,7 @@ bool TQTextEdit::sendMouseEventToInputContext( TQMouseEvent *e ) #ifndef TQT_NO_IM if ( d->composeMode() ) { TQTextCursor c( doc ); - if ( c.place( e->pos(), doc->firstParagraph(), FALSE, FALSE, FALSE ) ) { + if ( c.place( e->pos(), doc->firstParagraph(), FALSE ) ) { int mousePos = c.index() - d->preeditStart; if ( cursor->globalY() == c.globalY() && mousePos >= 0 && mousePos < d->preeditLength ) { |