Kaydet (Commit) fe7b8bc9 authored tarafından Caolán McNamara's avatar Caolán McNamara

gtk3: XEmbed isn't going to happen

Change-Id: I7a7589a159a7fccdc224262bf5f91f8d98f5f619
üst b5f60ef8
...@@ -268,6 +268,7 @@ class GtkSalFrame : public SalFrame ...@@ -268,6 +268,7 @@ class GtkSalFrame : public SalFrame
#endif #endif
#else #else
static gboolean signalExpose( GtkWidget*, GdkEventExpose*, gpointer ); static gboolean signalExpose( GtkWidget*, GdkEventExpose*, gpointer );
void askForXEmbedFocus( sal_Int32 nTimecode );
#endif #endif
static gboolean signalFocus( GtkWidget*, GdkEventFocus*, gpointer ); static gboolean signalFocus( GtkWidget*, GdkEventFocus*, gpointer );
static gboolean signalMap( GtkWidget*, GdkEvent*, gpointer ); static gboolean signalMap( GtkWidget*, GdkEvent*, gpointer );
...@@ -334,7 +335,6 @@ class GtkSalFrame : public SalFrame ...@@ -334,7 +335,6 @@ class GtkSalFrame : public SalFrame
void setMinMaxSize(); void setMinMaxSize();
void createNewWindow( ::Window aParent, bool bXEmbed, SalX11Screen nXScreen ); void createNewWindow( ::Window aParent, bool bXEmbed, SalX11Screen nXScreen );
void askForXEmbedFocus( sal_Int32 nTimecode );
void AllocateFrame(); void AllocateFrame();
void TriggerPaintEvent(); void TriggerPaintEvent();
......
...@@ -1290,13 +1290,6 @@ void GtkSalFrame::Init( SystemParentData* pSysData ) ...@@ -1290,13 +1290,6 @@ void GtkSalFrame::Init( SystemParentData* pSysData )
//FIXME: Handling embedded windows, is going to be fun ... //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 ) void GtkSalFrame::SetExtendedFrameStyle( SalExtStyle nStyle )
{ {
if( nStyle != m_nExtStyle && ! isChild() ) if( nStyle != m_nExtStyle && ! isChild() )
...@@ -1450,8 +1443,6 @@ void GtkSalFrame::Show( bool bVisible, bool /*bNoActivate*/ ) ...@@ -1450,8 +1443,6 @@ void GtkSalFrame::Show( bool bVisible, bool /*bNoActivate*/ )
if( m_pParent ) if( m_pParent )
m_pParent->EndExtTextInput(EndExtTextInputFlags::NONE); m_pParent->EndExtTextInput(EndExtTextInputFlags::NONE);
} }
if( m_bWindowIsGtkPlug )
askForXEmbedFocus( 0 );
} }
else else
{ {
...@@ -2611,13 +2602,6 @@ gboolean GtkSalFrame::signalButton( GtkWidget*, GdkEventButton* pEvent, gpointer ...@@ -2611,13 +2602,6 @@ gboolean GtkSalFrame::signalButton( GtkWidget*, GdkEventButton* pEvent, gpointer
gdk_display_pointer_ungrab( GtkSalFrame::getGdkDisplay(), GDK_CURRENT_TIME ); 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) // --- RTL --- (mirror mouse pos)
if( AllSettings::GetLayoutRTL() ) if( AllSettings::GetLayoutRTL() )
aEvent.mnX = pThis->maGeometry.nWidth-1-aEvent.mnX; aEvent.mnX = pThis->maGeometry.nWidth-1-aEvent.mnX;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment