diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2012-10-01 12:35:21 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2012-11-14 13:52:53 +0100 |
| commit | c7be8f17f57ea9661fd33435b34c58963f9255fc (patch) | |
| tree | 3edba42a6ed650cd0c13f9c871fea222f7f08115 /vcl/unx/gtk/window | |
| parent | c3720fc2b042923790d66d7d6c7a8a5e959784d2 (diff) | |
some moving around of casts
Diffstat (limited to 'vcl/unx/gtk/window')
| -rw-r--r-- | vcl/unx/gtk/window/gtkframe.cxx | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/vcl/unx/gtk/window/gtkframe.cxx b/vcl/unx/gtk/window/gtkframe.cxx index 7d7ccfafbaca..592c83d16f50 100644 --- a/vcl/unx/gtk/window/gtkframe.cxx +++ b/vcl/unx/gtk/window/gtkframe.cxx @@ -559,14 +559,15 @@ void on_registrar_available (GDBusConnection * /*connection*/, gpointer user_data) { SolarMutexGuard aGuard; - GtkSalFrame* pSalFrame = static_cast< GtkSalFrame* >( user_data ); + GtkSalFrame* pSalFrame = reinterpret_cast< GtkSalFrame* >( user_data ); GdkWindow* gdkWindow = gtk_widget_get_window( pSalFrame->getWindow() ); ensure_dbus_setup(gdkWindow, pSalFrame); - GtkSalMenu* pSalMenu = static_cast< GtkSalMenu* >( pSalFrame->GetMenu() ); + SalMenu* pSalMenu = pSalFrame->GetMenu(); if ( pSalMenu != NULL ) { - pSalMenu->UpdateNativeMenu(); - MenuBar* pMenuBar = static_cast< MenuBar* >( pSalMenu->GetMenu() ); + GtkSalMenu* pGtkSalMenu = static_cast<GtkSalMenu*>(pSalMenu); + pGtkSalMenu->UpdateNativeMenu(); + MenuBar* pMenuBar = static_cast< MenuBar* >( pGtkSalMenu->GetMenu() ); if(pMenuBar) pMenuBar->SetDisplayable(false); } @@ -577,19 +578,23 @@ void on_registrar_unavailable (GDBusConnection * /*connection*/, const gchar * /*name*/, gpointer user_data) { + SolarMutexGuard aGuard; + std::cout << "on_registrar_unavailable" << std::endl; pSessionBus = NULL; - GtkSalFrame* pSalFrame = static_cast< GtkSalFrame* >( user_data ); - GtkSalMenu* pSalMenu = static_cast< GtkSalMenu* >( pSalFrame->GetMenu() ); + GtkSalFrame* pSalFrame = reinterpret_cast< GtkSalFrame* >( user_data ); + SalMenu* pSalMenu = pSalFrame->GetMenu(); if ( pSalMenu ) { - pSalMenu->DisconnectFrame(); - MenuBar* pMenuBar = static_cast< MenuBar* >( pSalMenu->GetMenu() ); + GtkSalMenu* pGtkSalMenu = static_cast<GtkSalMenu*>(pSalMenu); + pGtkSalMenu->DisconnectFrame(); + MenuBar* pMenuBar = static_cast< MenuBar* >( pGtkSalMenu->GetMenu() ); pMenuBar->SetDisplayable( false ); } } void GtkSalFrame::EnsureAppMenuWatch() { + SolarMutexGuard aGuard; if(m_nWatcherId) g_bus_unwatch_name(m_nWatcherId); // Publish the menu only if AppMenu registrar is available. |