Pass the config object into the wxHtmlHelpFrame so it has the config

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

diff --git a/include/wx/dc.h b/include/wx/dc.h
index faed2c0dce3f1189824925cc53db49daf269f0f7..a5784f471ccc4528f8c8b64f90846762d4e42198 100644 (file)
--- a/include/wx/dc.h
+++ b/include/wx/dc.h
@@ -18,6 +18,7 @@
 
 #include "wx/object.h"          // the base class
 
+#include "wx/intl.h"            // for wxLayoutDirection
 #include "wx/cursor.h"          // we have member variables of these classes
 #include "wx/font.h"            // so we can't do without them
 #include "wx/colour.h"
@@ -855,6 +856,10 @@ private:
     #include "wx/os2/dc.h"
 #endif
 
+#if wxUSE_GRAPHICS_CONTEXT
+    #include "wx/dcgraph.h"
+#endif
+
 // ----------------------------------------------------------------------------
 // helper class: you can use it to temporarily change the DC text colour and
 // restore it automatically when the object goes out of scope
@@ -965,64 +970,70 @@ private:
 
 // ----------------------------------------------------------------------------
 // creates an overlay over an existing window, allowing for manipulations like
-// rubberbanding etc. this API is not stable yet, not to be used outside wx 
+// rubberbanding etc. this API is not stable yet, not to be used outside wx
 // internal code
 // ----------------------------------------------------------------------------
 
-class wxOverlayImpl ;
-class wxWindowDC ;
+class WXDLLEXPORT wxOverlayImpl;
+class WXDLLEXPORT wxWindowDC;
 
-class WXDLLEXPORT wxOverlay 
+class WXDLLEXPORT wxOverlay
 {
-public :
-    wxOverlay();    
+public:
+    wxOverlay();
     ~wxOverlay();
-    
+
     // clears the overlay without restoring the former state
     // to be done eg when the window content has been changed and repainted
     void Reset();
-    
-private :
+
+private:
     friend class WXDLLEXPORT wxDCOverlay;
-    
+
     // returns true if it has been setup
     bool IsOk();
 
-    void Init( wxWindowDC* dc, int x , int y , int width , int height );
-    
-    void BeginDrawing( wxWindowDC* dc);
-    
-    void EndDrawing( wxWindowDC* dc);
-    
-    void Clear( wxWindowDC* dc);
+    void Init(wxWindowDC* dc, int x , int y , int width , int height);
+
+    void BeginDrawing(wxWindowDC* dc);
+
+    void EndDrawing(wxWindowDC* dc);
+
+    void Clear(wxWindowDC* dc);
 
     wxOverlayImpl* m_impl;
-    
+
     bool m_inDrawing;
-} ;
+
+
+    DECLARE_NO_COPY_CLASS(wxOverlay)
+};
 
 class WXDLLEXPORT wxDCOverlay
 {
-public :
+public:
     // connects this overlay to the corresponding drawing dc, if the overlay is not initialized yet
     // this call will do so
-    wxDCOverlay(wxOverlay &overlay, wxWindowDC *dc, int x , int y , int width , int height);    
-    
+    wxDCOverlay(wxOverlay &overlay, wxWindowDC *dc, int x , int y , int width , int height);
+
     // convenience wrapper that behaves the same using the entire area of the dc
-    wxDCOverlay(wxOverlay &overlay, wxWindowDC *dc);    
+    wxDCOverlay(wxOverlay &overlay, wxWindowDC *dc);
 
     // removes the connection between the overlay and the dc
-    virtual ~wxDCOverlay();    
-    
+    virtual ~wxDCOverlay();
+
     // clears the layer, restoring the state at the last init
     void Clear();
-private :
+
+private:
     void Init(wxWindowDC *dc, int x , int y , int width , int height);
 
     wxOverlay& m_overlay;
 
     wxWindowDC* m_dc;
-} ;
 
-#endif
-    // _WX_DC_H_BASE_
+
+    DECLARE_NO_COPY_CLASS(wxDCOverlay)
+};
+
+#endif // _WX_DC_H_BASE_