use wxSizerFlags and updated CreateButtonSizer() in all generic dialogs

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

diff --git a/include/wx/motif/dcmemory.h b/include/wx/motif/dcmemory.h
index 51b16b19c9a192f04956b0489002727c357d170c..121dda66041079b25ee626bbc05e7a3ad4112ab2 100644 (file)
--- a/include/wx/motif/dcmemory.h
+++ b/include/wx/motif/dcmemory.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:     wxMemoryDC class
 // Author:      Julian Smart
 // Modified by:
 // Purpose:     wxMemoryDC class
 // Author:      Julian Smart
 // Modified by:


@@ -12,20 +12,16 @@
 #ifndef _WX_DCMEMORY_H_
 #define _WX_DCMEMORY_H_
 
 #ifndef _WX_DCMEMORY_H_
 #define _WX_DCMEMORY_H_
 

-#ifdef __GNUG__
-    #pragma interface "dcmemory.h"
-#endif
-

 #include "wx/dcclient.h"
 
 #include "wx/dcclient.h"
 

-class wxMemoryDC : public wxWindowDC
+class WXDLLIMPEXP_CORE wxMemoryDC : public wxWindowDC

 {
 {

-DECLARE_DYNAMIC_CLASS(wxMemoryDC)
+    DECLARE_DYNAMIC_CLASS(wxMemoryDC)

 
 public:
     wxMemoryDC();
     wxMemoryDC( wxDC *dc ); // Create compatible DC
 
 public:
     wxMemoryDC();
     wxMemoryDC( wxDC *dc ); // Create compatible DC

-    ~wxMemoryDC();
+    virtual ~wxMemoryDC();

 
     virtual void SelectObject( const wxBitmap& bitmap );
 
 
     virtual void SelectObject( const wxBitmap& bitmap );
 


@@ -34,10 +30,10 @@ public:
     wxBitmap& GetBitmap() const { return (wxBitmap&) m_bitmap; }
 
 private:
     wxBitmap& GetBitmap() const { return (wxBitmap&) m_bitmap; }
 
 private:

-    friend wxPaintDC;
+    friend class wxPaintDC;

 
     wxBitmap  m_bitmap;
 };
 
 #endif
 
     wxBitmap  m_bitmap;
 };
 
 #endif

-    // _WX_DCMEMORY_H_
+// _WX_DCMEMORY_H_