*** empty log message ***

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

include/wx/os2/bitmap.h

@@ -81,7 +81,9 @@ public:
   wxPalette     m_bitmapPalette;
   int           m_quality;
 
-/*  WXHBITMAP     m_hBitmap; TODO: platform-specific handle */
+  WXHBITMAP     m_hBitmap;
+  wxDC *        m_selectedInto; // So bitmap knows whether it's been selected into
+
   wxMask *      m_bitmapMask; // Optional mask
 };
 
@@ -184,14 +186,13 @@ public:
 protected:
   static wxList sm_handlers;
 
-/*
   // TODO: Implementation
 public:
   void SetHBITMAP(WXHBITMAP bmp);
   inline WXHBITMAP GetHBITMAP() const { return (M_BITMAPDATA ? M_BITMAPDATA->m_hBitmap : 0); }
-  bool FreeResource(bool force = FALSE);
-*/
-
+  inline void SetSelectedInto(wxDC *dc) { if (M_BITMAPDATA) M_BITMAPDATA->m_selectedInto = dc; }
+  inline wxDC *GetSelectedInto(void) const { return (M_BITMAPDATA ? M_BITMAPDATA->m_selectedInto : (wxDC*) NULL); }
+//  bool FreeResource(bool force = FALSE);
 };
 #endif
   // _WX_BITMAP_H_

include/wx/os2/dc.h

@@ -155,6 +155,20 @@ class WXDLLEXPORT wxDC: public wxDCBase
     virtual void SetInternalDeviceOrigin( long x, long y );
     virtual void GetInternalDeviceOrigin( long *x, long *y );
 
+    virtual void SetRop(WXHDC cdc);
+    virtual void DoClipping(WXHDC cdc);
+    virtual void SelectOldObjects(WXHDC dc);
+
+    wxWindow *GetWindow() const { return m_canvas; }
+    void SetWindow(wxWindow *win) { m_canvas = win; }
+
+    WXHDC GetHDC() const { return m_hDC; }
+    void SetHDC(WXHDC dc, bool bOwnsDC = FALSE)
+    {
+        m_hDC = dc;
+        m_bOwnsDC = bOwnsDC;
+    }
+
 private:
 
 #if WXWIN_COMPATIBILITY
@@ -177,13 +191,14 @@ protected:
     // ------------------------------------------------------------------------
 
     // Owner canvas and selected in bitmap (if bitmap is GDI object selected)
-    wxWindow*         m_owner;
-    wxBitmap*         m_bitmap;
+    wxWindow*         m_canvas;
+    wxBitmap          m_selectedBitmap;
 
     // our HDC and its usage count: we only free it when the usage count drops
     // to 0
     WXHDC             m_hDC;
     int               m_hDCCount;
+    bool              m_bOwnsDC:1;
 
     // Store all old GDI objects when do a SelectObject, so we can select them
     // back in (this unselecting user's objects) so we can safely delete the

include/wx/os2/dcclient.h

@@ -47,6 +47,12 @@ public:
     wxWindowDC(wxWindow *win);
 
     virtual ~wxWindowDC();
+
+    // PM specific stuff
+    HPS                     m_hPS;
+private:
+    HAB                     m_hab;
+    SIZEL                   m_PageSize;
 };
 
 class WXDLLEXPORT wxClientDC : public wxWindowDC

include/wx/os2/dcmemory.h

@@ -25,11 +25,12 @@ class WXDLLEXPORT wxMemoryDC: public wxPaintDC
   public:
     wxMemoryDC(void);
     wxMemoryDC( wxDC *dc ); // Create compatible DC
+
     ~wxMemoryDC(void);
     virtual void SelectObject( const wxBitmap& bitmap );
     void GetSize( int *width, int *height ) const;
 
-  private: 
+  private:
     friend wxPaintDC;
     wxBitmap  m_selected;
 };

include/wx/os2/dcprint.h

@@ -16,19 +16,40 @@
 #pragma interface "dcprint.h"
 #endif
 
+#if wxUSE_PRINTING_ARCHITECTURE
+
 #include "wx/dc.h"
+#include "wx/cmndata.h"
 
 class WXDLLEXPORT wxPrinterDC: public wxDC
 {
  public:
   DECLARE_CLASS(wxPrinterDC)
 
-  // Create a printer DC
-  wxPrinterDC(const wxString& driver, const wxString& device, const wxString& output, bool interactive = TRUE, int orientation = wxPORTRAIT);
+   // Create a printer DC [obsolete]
+   wxPrinterDC(const wxString& driver, const wxString& device, const wxString& output, bool interactive = TRUE, int orientation = wxPORTRAIT);
 
-  ~wxPrinterDC();
+   // Create from print data
+   wxPrinterDC(const wxPrintData& data);
+
+   wxPrinterDC(WXHDC theDC);
+
+   ~wxPrinterDC();
+
+    bool StartDoc(const wxString& message);
+    void EndDoc(void);
+    void StartPage(void);
+    void EndPage(void);
+
+protected:
+    wxPrintData         m_printData;
 };
 
+// Gets an HDC for the specified printer configuration
+WXHDC WXDLLEXPORT wxGetPrinterDC(const wxPrintData& data);
+
+#endif // wxUSE_PRINTING_ARCHITECTURE
+
 #endif
     // _WX_DCPRINT_H_