Still bit fiddling in wxImage.

SetSize rewritten.


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

include/wx/gtk/dialog.h

@@ -68,6 +68,8 @@ class wxDialog: public wxPanel
 /*
     void OnCharHook(wxKeyEvent& event);
 */
+    virtual void SetSize( int x, int y, int width, int height,
+      int sizeFlags = wxSIZE_AUTO );
     virtual bool Show( bool show );
     virtual int ShowModal(void);
     virtual void EndModal(int retCode);
@@ -83,18 +85,12 @@ class wxDialog: public wxPanel
     virtual void Maximize(void) { }
     virtual void Restore(void) { }
     
-  private:
+  // implementation
   
-    friend    wxWindow;
-    friend    wxDC;
-    friend    wxRadioBox;
-    
     bool       m_modalShowing;
     wxString   m_title;
     wxIcon     m_icon;
     
-    virtual void ImplementSetPosition();
-  
   DECLARE_EVENT_TABLE()
     
 };

include/wx/gtk/frame.h

@@ -64,6 +64,9 @@ public:
   virtual void GetClientSize( int *width, int *height ) const;
   virtual void SetClientSize( int const width, int const height );
 
+  virtual void SetSize( int x, int y, int width, int height,
+    int sizeFlags = wxSIZE_AUTO );
+    
   virtual wxStatusBar* CreateStatusBar(int number=1, long style = wxST_SIZEGRIP, wxWindowID id = 0,
     const wxString& name = "statusBar");
   virtual wxStatusBar *OnCreateStatusBar( int number, long style, wxWindowID id,
@@ -100,7 +103,6 @@ public:
   // implementation
   
   virtual void GtkOnSize( int x, int y, int width, int height );
-  virtual void ImplementSetPosition();
   virtual wxPoint GetClientAreaOrigin() const;
   void DoMenuUpdates();
   void DoMenuUpdates(wxMenu* menu);

include/wx/gtk/window.h

@@ -285,9 +285,6 @@ public:
   
           bool        HasVMT();
   
-  virtual void        ImplementSetSize();
-  virtual void        ImplementSetPosition();
-  
   virtual wxPoint     GetClientAreaOrigin() const;
   virtual void        AdjustForParentClientOrigin( int& x, int& y, int sizeFlags );