compilation fixes for wxGTK

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2960 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

include/wx/app.h

@@ -31,6 +31,18 @@
     typedef wxObject* (*wxAppInitializerFunction)();
 #endif
 
+// ----------------------------------------------------------------------------
+// headers we have to include here
+// ----------------------------------------------------------------------------
+
+#include "wx/event.h"       // for the base class
+
+#include "wx/window.h"      // for wxTopLevelWindows
+
+#if wxUSE_LOG
+    #include "wx/log.h"
+#endif
+
 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------

include/wx/image.h

@@ -18,9 +18,10 @@
 #include "wx/object.h"
 #include "wx/string.h"
 #include "wx/gdicmn.h"
+#include "wx/bitmap.h"
 
 #if wxUSE_STREAMS
-#include "wx/stream.h"
+    #include "wx/stream.h"
 #endif
 
 //-----------------------------------------------------------------------------
@@ -37,8 +38,6 @@ class WXDLLEXPORT wxJPEGHandler;
 class WXDLLEXPORT wxBMPHandler;
 class WXDLLEXPORT wxImage;
 
-class WXDLLEXPORT wxBitmap;
-
 //-----------------------------------------------------------------------------
 // wxImageHandler
 //-----------------------------------------------------------------------------
@@ -205,7 +204,7 @@ public:
   wxImage Scale( int width, int height ) const;
 
   // rescales the image in place
-  wxImage Rescale( int width, int height ) { *this = Scale(width, height); }
+  void Rescale( int width, int height ) { *this = Scale(width, height); }
 
   // these routines are slow but safe
   void SetRGB( int x, int y, unsigned char r, unsigned char g, unsigned char b );

src/gtk/app.cpp

@@ -8,6 +8,7 @@
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
+    #pragma implementation "appbase.h"
     #pragma implementation "app.h"
 #endif
 

src/gtk/menu.cpp

@@ -215,7 +215,7 @@ void wxMenuBar::Append( wxMenu *menu, const wxString &title )
     buf << '/' << str.mb_str();
     char *cbuf = new char[buf.Length()];
     GtkItemFactoryEntry entry;
-    entry.path = buf.c_str();
+    entry.path = (gchar *)buf.c_str();  // const_cast
     entry.accelerator = (gchar*) NULL;
     entry.callback = (GtkItemFactoryCallback) NULL;
     entry.callback_action = 0;
@@ -684,7 +684,7 @@ wxMenu::Init( const wxString& title, const wxFunction func, long style )
        entry.item_type = "<Tearoff>";
        entry.accelerator = (gchar*) NULL;
        gtk_item_factory_create_item( m_factory, &entry, (gpointer) this, 2 );  /* what is 2 ? */
-       GtkWidget *menuItem = gtk_item_factory_get_widget( m_factory, "<main>/tearoff" );
+       //GtkWidget *menuItem = gtk_item_factory_get_widget( m_factory, "<main>/tearoff" );
     }
 #endif
 }

src/gtk1/app.cpp

@@ -8,6 +8,7 @@
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
+    #pragma implementation "appbase.h"
     #pragma implementation "app.h"
 #endif
 

src/gtk1/menu.cpp

@@ -215,7 +215,7 @@ void wxMenuBar::Append( wxMenu *menu, const wxString &title )
     buf << '/' << str.mb_str();
     char *cbuf = new char[buf.Length()];
     GtkItemFactoryEntry entry;
-    entry.path = buf.c_str();
+    entry.path = (gchar *)buf.c_str();  // const_cast
     entry.accelerator = (gchar*) NULL;
     entry.callback = (GtkItemFactoryCallback) NULL;
     entry.callback_action = 0;
@@ -684,7 +684,7 @@ wxMenu::Init( const wxString& title, const wxFunction func, long style )
        entry.item_type = "<Tearoff>";
        entry.accelerator = (gchar*) NULL;
        gtk_item_factory_create_item( m_factory, &entry, (gpointer) this, 2 );  /* what is 2 ? */
-       GtkWidget *menuItem = gtk_item_factory_get_widget( m_factory, "<main>/tearoff" );
+       //GtkWidget *menuItem = gtk_item_factory_get_widget( m_factory, "<main>/tearoff" );
     }
 #endif
 }