mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gtk3: XEmbed isn't going to happen

Browse Source 
Change-Id: I7a7589a159a7fccdc224262bf5f91f8d98f5f619
This commit is contained in:
Caolán McNamara
2016-07-01 15:42:34 +01:00
parent b5f60ef841
commit fe7b8bc9fd
2 changed files with 1 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
vcl/inc/unx/gtk/gtkframe.hxx
View File

@@ -268,6 +268,7 @@ class GtkSalFrame : public SalFrame
#endif
#else
static gboolean signalExpose( GtkWidget*, GdkEventExpose*, gpointer );
void askForXEmbedFocus( sal_Int32 nTimecode );
#endif
static gboolean signalFocus( GtkWidget*, GdkEventFocus*, gpointer );
static gboolean signalMap( GtkWidget*, GdkEvent*, gpointer );
@@ -334,7 +335,6 @@ class GtkSalFrame : public SalFrame
void setMinMaxSize();
void createNewWindow( ::Window aParent, bool bXEmbed, SalX11Screen nXScreen );
void askForXEmbedFocus( sal_Int32 nTimecode );
void AllocateFrame();
void TriggerPaintEvent();

16
vcl/unx/gtk3/gtk3gtkframe.cxx
View File

@@ -1290,13 +1290,6 @@ void GtkSalFrame::Init( SystemParentData* pSysData )
//FIXME: Handling embedded windows, is going to be fun ...
}
void GtkSalFrame::askForXEmbedFocus( sal_Int32 i_nTimeCode )
{
(void) this; // loplugin:staticmethods
(void)i_nTimeCode;
//FIXME: no askForXEmbedFocus for gtk3 yet
}
void GtkSalFrame::SetExtendedFrameStyle( SalExtStyle nStyle )
{
if( nStyle != m_nExtStyle && ! isChild() )
@@ -1450,8 +1443,6 @@ void GtkSalFrame::Show( bool bVisible, bool /*bNoActivate*/ )
if( m_pParent )
m_pParent->EndExtTextInput(EndExtTextInputFlags::NONE);
}
if( m_bWindowIsGtkPlug )
askForXEmbedFocus( 0 );
}
else
{
@@ -2611,13 +2602,6 @@ gboolean GtkSalFrame::signalButton( GtkWidget*, GdkEventButton* pEvent, gpointer
gdk_display_pointer_ungrab( GtkSalFrame::getGdkDisplay(), GDK_CURRENT_TIME );
}
if( pThis->m_bWindowIsGtkPlug &&
pEvent->type == GDK_BUTTON_PRESS &&
pEvent->button == 1 )
{
pThis->askForXEmbedFocus( pEvent->time );
}
// --- RTL --- (mirror mouse pos)
if( AllSettings::GetLayoutRTL() )
aEvent.mnX = pThis->maGeometry.nWidth-1-aEvent.mnX;