diff options
author | Michael Meeks <michael.meeks@suse.com> | 2011-11-04 14:40:18 +0000 |
---|---|---|
committer | Michael Meeks <michael.meeks@suse.com> | 2011-11-07 14:19:33 +0000 |
commit | 17084c750df84e0da377d716a4088f72bd25f972 (patch) | |
tree | 148077dac89e352f9b6c35a83f2950b66e6cb40d /vcl/unx/gtk/window | |
parent | 7a47e0ead3471f8f6e737a79704ad8ad2978418a (diff) |
gtk: move the file-picker into vcl/ and add Application:: factory hooks
drop un-necessary uno service related fluff, and component instantiation.
nominal move to XMultiComponentFactory from XMultiServiceFactory
Include fpicker in compilation for gtk3, but more work required here
Simplify setting up transient parents for picker dialogs
Diffstat (limited to 'vcl/unx/gtk/window')
-rw-r--r-- | vcl/unx/gtk/window/gtkframe.cxx | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/vcl/unx/gtk/window/gtkframe.cxx b/vcl/unx/gtk/window/gtkframe.cxx index f3e7f6ff188f..e8998ca94abc 100644 --- a/vcl/unx/gtk/window/gtkframe.cxx +++ b/vcl/unx/gtk/window/gtkframe.cxx @@ -664,6 +664,9 @@ void GtkSalFrame::InitCommon() m_aSystemData.nDepth = pDisp->GetVisual( m_nScreen ).GetDepth(); m_aSystemData.aColormap = pDisp->GetColormap( m_nScreen ).GetXColormap(); m_aSystemData.aWindow = widget_get_xid(m_pWindow); +#else + static int nWindow = 0; + m_aSystemData.aWindow = nWindow++; #endif m_aSystemData.pSalFrame = this; m_aSystemData.pWidget = m_pWindow; @@ -3284,6 +3287,7 @@ gboolean GtkSalFrame::signalMap( GtkWidget *pWidget, GdkEvent*, gpointer frame ) RevertToParent, CurrentTime ); } #else + (void)pWidget; # warning FIXME no set input focus ... #endif |