Fix wrong tab order in wxAuiNotebook after dragging.

[wxWidgets.git] / include / wx / osx / dcmemory.h

diff --git a/include/wx/osx/dcmemory.h b/include/wx/osx/dcmemory.h
index 7c69b01f79caef1a6cf501fa4e7a0f8c75de9bff..97250267776908c16d38a842a3a843b94dc53a81 100644 (file)
--- a/include/wx/osx/dcmemory.h
+++ b/include/wx/osx/dcmemory.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        dcmemory.h
+// Name:        wx/osx/dcmemory.h

 // Purpose:     wxMemoryDC class
 // Author:      Stefan Csomor
 // Modified by:
 // Purpose:     wxMemoryDC class
 // Author:      Stefan Csomor
 // Modified by:


@@ -12,19 +12,19 @@
 #ifndef _WX_DCMEMORY_H_
 #define _WX_DCMEMORY_H_
 
 #ifndef _WX_DCMEMORY_H_
 #define _WX_DCMEMORY_H_
 

-#include "wx/osx/carbon/dcclient.h"
+#include "wx/osx/dcclient.h"

 
 class WXDLLIMPEXP_CORE wxMemoryDCImpl: public wxPaintDCImpl
 {
 public:
     wxMemoryDCImpl( wxMemoryDC *owner );
     wxMemoryDCImpl( wxMemoryDC *owner, wxBitmap& bitmap );
 
 class WXDLLIMPEXP_CORE wxMemoryDCImpl: public wxPaintDCImpl
 {
 public:
     wxMemoryDCImpl( wxMemoryDC *owner );
     wxMemoryDCImpl( wxMemoryDC *owner, wxBitmap& bitmap );

-    wxMemoryDCImpl( wxMemoryDC *owner, wxDC *dc ); 
-    
+    wxMemoryDCImpl( wxMemoryDC *owner, wxDC *dc );
+

     virtual ~wxMemoryDCImpl();
 
     virtual void DoGetSize( int *width, int *height ) const;
     virtual ~wxMemoryDCImpl();
 
     virtual void DoGetSize( int *width, int *height ) const;

-    virtual wxBitmap DoGetAsBitmap(const wxRect *subrect) const 
+    virtual wxBitmap DoGetAsBitmap(const wxRect *subrect) const

        { return subrect == NULL ? GetSelectedBitmap() : GetSelectedBitmap().GetSubBitmap(*subrect); }
     virtual void DoSelect(const wxBitmap& bitmap);
 
        { return subrect == NULL ? GetSelectedBitmap() : GetSelectedBitmap().GetSubBitmap(*subrect); }
     virtual void DoSelect(const wxBitmap& bitmap);
 


@@ -32,14 +32,14 @@ public:
         { return m_selected; }
     virtual wxBitmap& GetSelectedBitmap()
         { return m_selected; }
         { return m_selected; }
     virtual wxBitmap& GetSelectedBitmap()
         { return m_selected; }

-    
+

 private:
     void Init();
 
     wxBitmap  m_selected;
 private:
     void Init();
 
     wxBitmap  m_selected;

-    
+

     DECLARE_CLASS(wxMemoryDCImpl)
     DECLARE_CLASS(wxMemoryDCImpl)

-    DECLARE_NO_COPY_CLASS(wxMemoryDCImpl)
+    wxDECLARE_NO_COPY_CLASS(wxMemoryDCImpl);

 };
 
 #endif
 };
 
 #endif