check that the version of __sync_sub_and_fetch that returns a value is supported...

[wxWidgets.git] / src / gtk / frame.cpp

diff --git a/src/gtk/frame.cpp b/src/gtk/frame.cpp
index dfec0ddbaad3d504619a1295d51b329804197e31..118148b185df88eded61f1ddc1d8fd20714da2b4 100644 (file)
--- a/src/gtk/frame.cpp
+++ b/src/gtk/frame.cpp
@@ -20,6 +20,10 @@
 
 #include <gtk/gtk.h>
 
 
 #include <gtk/gtk.h>
 

+#if wxUSE_LIBHILDON
+    #include <hildon-widgets/hildon-window.h>
+#endif // wxUSE_LIBHILDON
+

 // ----------------------------------------------------------------------------
 // event tables
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // event tables
 // ----------------------------------------------------------------------------


@@ -110,7 +114,7 @@ void wxFrame::DoGetClientSize( int *width, int *height ) const
         *height = 0;
 }
 
         *height = 0;
 }
 

-#if wxUSE_MENUS
+#if wxUSE_MENUS && wxUSE_ACCEL

 // Helper for wxCreateAcceleratorTableForMenuBar
 static void wxAddAccelerators(wxList& accelEntries, wxMenu* menu)
 {
 // Helper for wxCreateAcceleratorTableForMenuBar
 static void wxAddAccelerators(wxList& accelEntries, wxMenu* menu)
 {


@@ -166,21 +170,21 @@ static wxAcceleratorTable wxCreateAcceleratorTableForMenuBar(wxMenuBar* menuBar)
 
     return table;
 }
 
     return table;
 }

-#endif
+#endif // wxUSE_MENUS && wxUSE_ACCEL

 
 bool wxFrame::ShowFullScreen(bool show, long style)
 {
     if (!wxFrameBase::ShowFullScreen(show, style))
         return false;
 
 
 bool wxFrame::ShowFullScreen(bool show, long style)
 {
     if (!wxFrameBase::ShowFullScreen(show, style))
         return false;
 

-#if wxUSE_MENUS
+#if wxUSE_MENUS && wxUSE_ACCEL

     if (show && GetMenuBar())
     {
         wxAcceleratorTable table(wxCreateAcceleratorTableForMenuBar(GetMenuBar()));
         if (table.IsOk())
             SetAcceleratorTable(table);
     }
     if (show && GetMenuBar())
     {
         wxAcceleratorTable table(wxCreateAcceleratorTableForMenuBar(GetMenuBar()));
         if (table.IsOk())
             SetAcceleratorTable(table);
     }

-#endif
+#endif // wxUSE_MENUS && wxUSE_ACCEL

 
     wxWindow* const bar[] = {
 #if wxUSE_MENUS
 
     wxWindow* const bar[] = {
 #if wxUSE_MENUS


@@ -267,11 +271,15 @@ void wxFrame::DetachMenuBar()
 
     if ( m_frameMenuBar )
     {
 
     if ( m_frameMenuBar )
     {

+#if wxUSE_LIBHILDON
+        hildon_window_set_menu(HILDON_WINDOW(m_widget), NULL);
+#else // !wxUSE_LIBHILDON

         m_frameMenuBar->UnsetInvokingWindow( this );
 
         gtk_widget_ref( m_frameMenuBar->m_widget );
 
         gtk_container_remove( GTK_CONTAINER(m_mainWidget), m_frameMenuBar->m_widget );
         m_frameMenuBar->UnsetInvokingWindow( this );
 
         gtk_widget_ref( m_frameMenuBar->m_widget );
 
         gtk_container_remove( GTK_CONTAINER(m_mainWidget), m_frameMenuBar->m_widget );

+#endif // wxUSE_LIBHILDON/!wxUSE_LIBHILDON

     }
 
     wxFrameBase::DetachMenuBar();
     }
 
     wxFrameBase::DetachMenuBar();


@@ -286,6 +294,10 @@ void wxFrame::AttachMenuBar( wxMenuBar *menuBar )
 
     if (m_frameMenuBar)
     {
 
     if (m_frameMenuBar)
     {

+#if wxUSE_LIBHILDON
+        hildon_window_set_menu(HILDON_WINDOW(m_widget),
+                               GTK_MENU(m_frameMenuBar->m_menubar));
+#else // !wxUSE_LIBHILDON

         m_frameMenuBar->SetInvokingWindow( this );
 
         m_frameMenuBar->SetParent(this);
         m_frameMenuBar->SetInvokingWindow( this );
 
         m_frameMenuBar->SetParent(this);


@@ -309,6 +321,7 @@ void wxFrame::AttachMenuBar( wxMenuBar *menuBar )
         gtk_widget_set_size_request(menuBar->m_widget, -1, -1);
 
         gtk_widget_show( m_frameMenuBar->m_widget );
         gtk_widget_set_size_request(menuBar->m_widget, -1, -1);
 
         gtk_widget_show( m_frameMenuBar->m_widget );

+#endif // wxUSE_LIBHILDON/!wxUSE_LIBHILDON

     }
     // make sure next size_allocate causes a wxSizeEvent
     m_oldClientWidth = 0;
     }
     // make sure next size_allocate causes a wxSizeEvent
     m_oldClientWidth = 0;