define wxHAS_RAW_BITMAP for wxDFB

[wxWidgets.git] / include / wx / dc.h

diff --git a/include/wx/dc.h b/include/wx/dc.h
index 8599c02433dca73d9a537a379c6a7c4d76bb5485..10e091b2289f53cbd5c036c06529b27d2eb51257 100644 (file)
--- a/include/wx/dc.h
+++ b/include/wx/dc.h
@@ -116,11 +116,8 @@ public:
     wxDCFactory() {}
     virtual ~wxDCFactory() {}
 
     wxDCFactory() {}
     virtual ~wxDCFactory() {}
 

-    virtual wxDCImpl* CreateWindowDC( wxWindowDC *owner ) = 0;

     virtual wxDCImpl* CreateWindowDC( wxWindowDC *owner, wxWindow *window ) = 0;
     virtual wxDCImpl* CreateWindowDC( wxWindowDC *owner, wxWindow *window ) = 0;

-    virtual wxDCImpl* CreateClientDC( wxClientDC *owner ) = 0;

     virtual wxDCImpl* CreateClientDC( wxClientDC *owner, wxWindow *window ) = 0;
     virtual wxDCImpl* CreateClientDC( wxClientDC *owner, wxWindow *window ) = 0;

-    virtual wxDCImpl* CreatePaintDC( wxPaintDC *owner ) = 0;

     virtual wxDCImpl* CreatePaintDC( wxPaintDC *owner, wxWindow *window ) = 0;
     virtual wxDCImpl* CreateMemoryDC( wxMemoryDC *owner ) = 0;
     virtual wxDCImpl* CreateMemoryDC( wxMemoryDC *owner, wxBitmap &bitmap ) = 0;
     virtual wxDCImpl* CreatePaintDC( wxPaintDC *owner, wxWindow *window ) = 0;
     virtual wxDCImpl* CreateMemoryDC( wxMemoryDC *owner ) = 0;
     virtual wxDCImpl* CreateMemoryDC( wxMemoryDC *owner, wxBitmap &bitmap ) = 0;


@@ -146,11 +143,8 @@ class WXDLLIMPEXP_CORE wxNativeDCFactory: public wxDCFactory
 public:
     wxNativeDCFactory() {}
 
 public:
     wxNativeDCFactory() {}
 

-    virtual wxDCImpl* CreateWindowDC( wxWindowDC *owner );

     virtual wxDCImpl* CreateWindowDC( wxWindowDC *owner, wxWindow *window );
     virtual wxDCImpl* CreateWindowDC( wxWindowDC *owner, wxWindow *window );

-    virtual wxDCImpl* CreateClientDC( wxClientDC *owner );

     virtual wxDCImpl* CreateClientDC( wxClientDC *owner, wxWindow *window );
     virtual wxDCImpl* CreateClientDC( wxClientDC *owner, wxWindow *window );

-    virtual wxDCImpl* CreatePaintDC( wxPaintDC *owner );

     virtual wxDCImpl* CreatePaintDC( wxPaintDC *owner, wxWindow *window );
     virtual wxDCImpl* CreateMemoryDC( wxMemoryDC *owner );
     virtual wxDCImpl* CreateMemoryDC( wxMemoryDC *owner, wxBitmap &bitmap );
     virtual wxDCImpl* CreatePaintDC( wxPaintDC *owner, wxWindow *window );
     virtual wxDCImpl* CreateMemoryDC( wxMemoryDC *owner );
     virtual wxDCImpl* CreateMemoryDC( wxMemoryDC *owner, wxBitmap &bitmap );


@@ -169,7 +163,7 @@ class WXDLLIMPEXP_CORE wxDCImpl: public wxObject
 {
 public:
     wxDCImpl( wxDC *owner );
 {
 public:
     wxDCImpl( wxDC *owner );

-    ~wxDCImpl();
+    virtual ~wxDCImpl();

 
     wxDC *GetOwner() const { return m_owner; }
 
 
     wxDC *GetOwner() const { return m_owner; }
 


@@ -261,32 +255,41 @@ public:
     // setters and getters
 
     virtual void SetFont(const wxFont& font) = 0;
     // setters and getters
 
     virtual void SetFont(const wxFont& font) = 0;

-    virtual const wxFont&   GetFont() const { return m_font; }
+    virtual const wxFont& GetFont() const { return m_font; }

 
     virtual void SetPen(const wxPen& pen) = 0;
 
     virtual void SetPen(const wxPen& pen) = 0;

-    virtual const wxPen&    GetPen() const { return m_pen; }
+    virtual const wxPen& GetPen() const { return m_pen; }

 
     virtual void SetBrush(const wxBrush& brush) = 0;
 
     virtual void SetBrush(const wxBrush& brush) = 0;

-    virtual const wxBrush&  GetBrush() const { return m_brush; }
+    virtual const wxBrush& GetBrush() const { return m_brush; }

 
     virtual void SetBackground(const wxBrush& brush) = 0;
 
     virtual void SetBackground(const wxBrush& brush) = 0;

-    virtual const wxBrush&  GetBackground() const { return m_backgroundBrush; }
+    virtual const wxBrush& GetBackground() const { return m_backgroundBrush; }

 
     virtual void SetBackgroundMode(int mode) = 0;
     virtual int GetBackgroundMode() const { return m_backgroundMode; }
 
     virtual void SetTextForeground(const wxColour& colour)
         { m_textForegroundColour = colour; }
 
     virtual void SetBackgroundMode(int mode) = 0;
     virtual int GetBackgroundMode() const { return m_backgroundMode; }
 
     virtual void SetTextForeground(const wxColour& colour)
         { m_textForegroundColour = colour; }

-    virtual const wxColour& GetTextForeground() const { return m_textForegroundColour; }
+    virtual const wxColour& GetTextForeground() const
+        { return m_textForegroundColour; }

 
     virtual void SetTextBackground(const wxColour& colour)
         { m_textBackgroundColour = colour; }
 
     virtual void SetTextBackground(const wxColour& colour)
         { m_textBackgroundColour = colour; }

-    virtual const wxColour& GetTextBackground() const { return m_textBackgroundColour; }
+    virtual const wxColour& GetTextBackground() const
+        { return m_textBackgroundColour; }

 
 #if wxUSE_PALETTE
     virtual void SetPalette(const wxPalette& palette) = 0;
 #endif // wxUSE_PALETTE
 
 
 #if wxUSE_PALETTE
     virtual void SetPalette(const wxPalette& palette) = 0;
 #endif // wxUSE_PALETTE
 

+    // inherit the DC attributes (font and colours) from the given window
+    //
+    // this is called automatically when a window, client or paint DC is
+    // created
+    virtual void InheritAttributes(wxWindow *win);
+
+

     // logical functions
 
     virtual void SetLogicalFunction(int function) = 0;
     // logical functions
 
     virtual void SetLogicalFunction(int function) = 0;