stream compile fixes

bitmap, icon, imaglist work (broken)
notebook client resize fixed (ugly)


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

include/wx/gtk1/bitmap.h

@@ -102,6 +102,8 @@ class wxBitmap: public wxObject
     wxMask *GetMask(void) const;
     void SetMask( wxMask *mask );
     
+    void Resize( int height, int width );
+    
     bool SaveFile( const wxString &name, int type, wxPalette *palette = NULL );
     bool LoadFile( const wxString &name, int type );
 
@@ -121,6 +123,10 @@ class wxBitmap: public wxObject
     GdkPixmap *GetPixmap(void) const;
     GdkBitmap *GetBitmap(void) const;
     
+    void DestroyImage(void);
+    void RecreateImage(void);
+    void Render(void);
+    
     // no data :-)
 };
 

include/wx/gtk1/frame.h

@@ -70,7 +70,9 @@ class wxFrame: public wxWindow
     wxString GetTitle(void) const;
     void OnActivate( wxActivateEvent &WXUNUSED(event) ) {};
     
-    void GtkOnSize( int width, int height );
+  //private:    
+    
+    void GtkOnSize( int x, int y, int width, int height );
     
   private:
   

include/wx/gtk1/icon.h

@@ -40,11 +40,8 @@ public:
 
   inline wxIcon(const wxIcon& icon) { Ref(icon); }
   inline wxIcon(const wxIcon* icon) { if (icon) Ref(*icon); }
+  wxIcon( char **bits, int width=-1, int height=-1 );
   
-  // Don't change this. Robert.
-  wxIcon( char **bits, int WXUNUSED(width), int WXUNUSED(height) ) :
-    wxBitmap( bits ) {};
-    
   inline wxIcon& operator = (const wxIcon& icon) { if (*this == icon) return (*this); Ref(icon); return *this; }
   inline bool operator == (const wxIcon& icon) { return m_refData == icon.m_refData; }
   inline bool operator != (const wxIcon& icon) { return m_refData != icon.m_refData; }

include/wx/gtk1/notebook.h

@@ -31,6 +31,7 @@ class wxNotebookPage;
 // ----------------------------------------------------------------------------
 // notebook events
 // ----------------------------------------------------------------------------
+
 class wxNotebookEvent : public wxCommandEvent
 {
 public:
@@ -139,10 +140,6 @@ public:
   // base class virtuals
   virtual void AddChild(wxWindow *child);
 
-protected:
-  // wxWin callbacks
-  void OnSize(wxSizeEvent& event);
-
 private:
   // common part of all ctors
   void Init();