Fix wrong tab order in wxAuiNotebook after dragging.

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

diff --git a/include/wx/dcgraph.h b/include/wx/dcgraph.h
index 38ebbb61cc03d72df1437ba8e68dedc0cef09e0b..d010b63ae405804ebf4c11102a3f0aa1ada049cf 100644 (file)
--- a/include/wx/dcgraph.h
+++ b/include/wx/dcgraph.h
@@ -32,6 +32,8 @@ public:
 #if defined(__WXMSW__) && wxUSE_ENH_METAFILE
     wxGCDC( const wxEnhMetaFileDC& dc );
 #endif
 #if defined(__WXMSW__) && wxUSE_ENH_METAFILE
     wxGCDC( const wxEnhMetaFileDC& dc );
 #endif

+    wxGCDC(wxGraphicsContext* context);
+    

     wxGCDC();
     virtual ~wxGCDC();
 
     wxGCDC();
     virtual ~wxGCDC();
 


@@ -66,9 +68,6 @@ public:
 
     virtual ~wxGCDCImpl();
 
 
     virtual ~wxGCDCImpl();
 

-    void Init();
-
-

     // implement base class pure virtuals
     // ----------------------------------
 
     // implement base class pure virtuals
     // ----------------------------------
 


@@ -100,8 +99,6 @@ public:
     virtual int GetDepth() const;
     virtual wxSize GetPPI() const;
 
     virtual int GetDepth() const;
     virtual wxSize GetPPI() const;
 

-    virtual void SetMapMode(wxMappingMode mode);
-

     virtual void SetLogicalFunction(wxRasterOperationMode function);
 
     virtual void SetTextForeground(const wxColour& colour);
     virtual void SetLogicalFunction(wxRasterOperationMode function);
 
     virtual void SetTextForeground(const wxColour& colour);


@@ -112,6 +109,8 @@ public:
     wxGraphicsContext* GetGraphicsContext() const { return m_graphicContext; }
     virtual void SetGraphicsContext( wxGraphicsContext* ctx );
 
     wxGraphicsContext* GetGraphicsContext() const { return m_graphicContext; }
     virtual void SetGraphicsContext( wxGraphicsContext* ctx );
 

+    virtual void* GetHandle() const;
+

     // the true implementations
     virtual bool DoFloodFill(wxCoord x, wxCoord y, const wxColour& col,
                              wxFloodFillStyle style = wxFLOOD_SURFACE);
     // the true implementations
     virtual bool DoFloodFill(wxCoord x, wxCoord y, const wxColour& col,
                              wxFloodFillStyle style = wxFLOOD_SURFACE);


@@ -204,9 +203,12 @@ public:
 #endif // __WXMSW__
 
 protected:
 #endif // __WXMSW__
 
 protected:

+    // unused int parameter distinguishes this version, which does not create a
+    // wxGraphicsContext, in the expectation that the derived class will do it
+    wxGCDCImpl(wxDC* owner, int);
+

     // scaling variables
     bool m_logicalFunctionSupported;
     // scaling variables
     bool m_logicalFunctionSupported;

-    double       m_mm_to_pix_x, m_mm_to_pix_y;

     wxGraphicsMatrix m_matrixOriginal;
     wxGraphicsMatrix m_matrixCurrent;
 
     wxGraphicsMatrix m_matrixOriginal;
     wxGraphicsMatrix m_matrixCurrent;
 


@@ -214,6 +216,9 @@ protected:
 
     wxGraphicsContext* m_graphicContext;
 
 
     wxGraphicsContext* m_graphicContext;
 

+private:
+    void Init(wxGraphicsContext*);
+

     DECLARE_CLASS(wxGCDCImpl)
     wxDECLARE_NO_COPY_CLASS(wxGCDCImpl);
 };
     DECLARE_CLASS(wxGCDCImpl)
     wxDECLARE_NO_COPY_CLASS(wxGCDCImpl);
 };