Updates from Chris Breeze

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

include/wx/app.h

@@ -51,8 +51,10 @@ public:
 // (e.g. hello.cpp).
 // Now IMPLEMENT_APP should add this code if required.
 
-#if defined(AIX) || defined(AIX4) /* || defined(____HPUX__) */
-#define IMPLEMENT_WXWIN_MAIN int main(int argc, char *argv[]) { return wxEntry(argc, argv); }
+#if defined(__AIX__) || defined(__SUN__) || defined(__HPUX__)
+#define IMPLEMENT_WXWIN_MAIN \
+extern int wxEntry( int argc, char *argv[] ); \
+int main(int argc, char *argv[]) { return wxEntry(argc, argv); }
 #else
 #define IMPLEMENT_WXWIN_MAIN
 #endif

include/wx/gtk/bitmap.h

@@ -3,7 +3,7 @@
 // Purpose:
 // Author:      Robert Roebling
 // Created:     01/02/97
-// Id:
+// RCS-ID:      $Id$
 // Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
 // Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -25,6 +25,11 @@
 // classes
 //-----------------------------------------------------------------------------
 
+class wxDC;
+class wxPaintDC;
+class wxMemoryDC;
+class wxToolBarGTK;
+
 class wxMask;
 class wxBitmap;
 
@@ -44,8 +49,13 @@ class wxMask: public wxObject
     wxMask( const wxBitmap& bitmap );
     ~wxMask(void);
 
-  public:
+  private:
   
+    friend wxBitmap;
+    friend wxDC;
+    friend wxPaintDC;
+    friend wxToolBarGTK;
+    
     GdkBitmap *GetBitmap(void) const;
     
   protected:
@@ -58,6 +68,7 @@ class wxMask: public wxObject
 // wxBitmap
 //-----------------------------------------------------------------------------
 
+// CMB 20/5/98: added xbm constructor and GetBitmap() method
 class wxBitmap: public wxObject
 {
   DECLARE_DYNAMIC_CLASS(wxBitmap)
@@ -66,6 +77,7 @@ class wxBitmap: public wxObject
 
     wxBitmap(void);
     wxBitmap( const int width, const int height, const int depth = -1 );
+    wxBitmap( const char bits[], const int width, const int height, const int depth = 1 );
     wxBitmap( char **bits );
     wxBitmap( const wxBitmap& bmp );
     wxBitmap( const wxBitmap* bmp );
@@ -93,9 +105,15 @@ class wxBitmap: public wxObject
     wxPalette *GetColourMap(void) const
       { return GetPalette(); };
 
-  public:
+  private:
+  
+    friend wxDC;
+    friend wxPaintDC;
+    friend wxMemoryDC;
+    friend wxToolBarGTK;
 
     GdkPixmap *GetPixmap(void) const;
+    GdkBitmap *GetBitmap(void) const;
     
     // no data :-)
 };

include/wx/gtk/dcmemory.h

@@ -3,7 +3,7 @@
 // Purpose:
 // Author:      Robert Roebling
 // Created:     01/02/97
-// Id:
+// RCS-ID:      $Id$
 // Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
 // Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -41,6 +41,7 @@ class WXDLLEXPORT wxMemoryDC: public wxPaintDC
     void GetSize( int *width, int *height );
 
   private: 
+    friend wxPaintDC;
     wxBitmap  m_selected;
 };
 

include/wx/gtk1/bitmap.h

@@ -3,7 +3,7 @@
 // Purpose:
 // Author:      Robert Roebling
 // Created:     01/02/97
-// Id:
+// RCS-ID:      $Id$
 // Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
 // Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -25,6 +25,11 @@
 // classes
 //-----------------------------------------------------------------------------
 
+class wxDC;
+class wxPaintDC;
+class wxMemoryDC;
+class wxToolBarGTK;
+
 class wxMask;
 class wxBitmap;
 
@@ -44,8 +49,13 @@ class wxMask: public wxObject
     wxMask( const wxBitmap& bitmap );
     ~wxMask(void);
 
-  public:
+  private:
   
+    friend wxBitmap;
+    friend wxDC;
+    friend wxPaintDC;
+    friend wxToolBarGTK;
+    
     GdkBitmap *GetBitmap(void) const;
     
   protected:
@@ -58,6 +68,7 @@ class wxMask: public wxObject
 // wxBitmap
 //-----------------------------------------------------------------------------
 
+// CMB 20/5/98: added xbm constructor and GetBitmap() method
 class wxBitmap: public wxObject
 {
   DECLARE_DYNAMIC_CLASS(wxBitmap)
@@ -66,6 +77,7 @@ class wxBitmap: public wxObject
 
     wxBitmap(void);
     wxBitmap( const int width, const int height, const int depth = -1 );
+    wxBitmap( const char bits[], const int width, const int height, const int depth = 1 );
     wxBitmap( char **bits );
     wxBitmap( const wxBitmap& bmp );
     wxBitmap( const wxBitmap* bmp );
@@ -93,9 +105,15 @@ class wxBitmap: public wxObject
     wxPalette *GetColourMap(void) const
       { return GetPalette(); };
 
-  public:
+  private:
+  
+    friend wxDC;
+    friend wxPaintDC;
+    friend wxMemoryDC;
+    friend wxToolBarGTK;
 
     GdkPixmap *GetPixmap(void) const;
+    GdkBitmap *GetBitmap(void) const;
     
     // no data :-)
 };

include/wx/gtk1/dcmemory.h

@@ -3,7 +3,7 @@
 // Purpose:
 // Author:      Robert Roebling
 // Created:     01/02/97
-// Id:
+// RCS-ID:      $Id$
 // Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
 // Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -41,6 +41,7 @@ class WXDLLEXPORT wxMemoryDC: public wxPaintDC
     void GetSize( int *width, int *height );
 
   private: 
+    friend wxPaintDC;
     wxBitmap  m_selected;
 };
 

include/wx/msw/dc.h

@@ -100,6 +100,7 @@ public:
   virtual void SetSystemScale(double x, double y);
   virtual void SetLogicalOrigin(long x, long y);
   virtual void SetDeviceOrigin(long x, long y);
+  virtual void SetAxisOrientation(bool xLeftRight, bool yBottomUp);
 
   // This group of functions does actual conversion
   // of the input, as you'd expect.
@@ -217,6 +218,9 @@ protected:
   double             m_userScaleX;
   double             m_userScaleY;
 
+  int                m_signX;		// Used by SetAxisOrientation() to
+  int                m_signY;		// invert the axes
+
   int               m_mappingMode;
 
   long             m_minX;          // bounding box