Add missing WXK constants for the control keys

[wxWidgets.git] / src / motif / dcmemory.cpp

diff --git a/src/motif/dcmemory.cpp b/src/motif/dcmemory.cpp
index fbe064c5619808d0400497d792f67af7bb5fd606..72c64deea89e55be29a2a4432cf1fddd75cedc16 100644 (file)
--- a/src/motif/dcmemory.cpp
+++ b/src/motif/dcmemory.cpp
@@ -1,24 +1,23 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        dcmemory.cpp
-// Purpose:     wxMemoryDC class
+// Name:        src/motif/dcmemory.cpp
+// Purpose:     wxMemoryDCImpl class

 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// Licence:    wxWidgets licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "dcmemory.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

-#include "wx/dcmemory.h"
-#include "wx/settings.h"
-#include "wx/utils.h"
+#ifndef WX_PRECOMP
+    #include "wx/utils.h"
+    #include "wx/settings.h"
+    #include "wx/dcmemory.h"
+    #include "wx/dcclient.h"
+#endif

 
 #ifdef __VMS__
 #pragma message disable nosimpint
 
 #ifdef __VMS__
 #pragma message disable nosimpint


@@ -29,20 +28,21 @@
 #endif
 
 #include "wx/motif/private.h"
 #endif
 
 #include "wx/motif/private.h"

+#include "wx/motif/dcmemory.h"

 
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------

-// wxMemoryDC
+// wxMemoryDCImpl

 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 

-IMPLEMENT_DYNAMIC_CLASS(wxMemoryDC, wxWindowDC)
+IMPLEMENT_ABSTRACT_CLASS(wxMemoryDCImpl, wxWindowDCImpl)

 
 

-wxMemoryDC::wxMemoryDC(void)
+void wxMemoryDCImpl::Init()

 {
 {

-    m_ok = TRUE;
+    m_ok = true;

     m_display = wxGetDisplay();
     m_display = wxGetDisplay();

-    
+

     Display* display = (Display*) m_display;
     Display* display = (Display*) m_display;

-    
+

     XGCValues gcvalues;
     gcvalues.foreground = BlackPixel (display, DefaultScreen (display));
     gcvalues.background = WhitePixel (display, DefaultScreen (display));
     XGCValues gcvalues;
     gcvalues.foreground = BlackPixel (display, DefaultScreen (display));
     gcvalues.background = WhitePixel (display, DefaultScreen (display));


@@ -52,28 +52,25 @@ wxMemoryDC::wxMemoryDC(void)
     m_gc = (WXGC) XCreateGC (display, RootWindow (display, DefaultScreen (display)),
         GCForeground | GCBackground | GCGraphicsExposures | GCLineWidth | GCSubwindowMode,
         &gcvalues);
     m_gc = (WXGC) XCreateGC (display, RootWindow (display, DefaultScreen (display)),
         GCForeground | GCBackground | GCGraphicsExposures | GCLineWidth | GCSubwindowMode,
         &gcvalues);

-    
-    m_backgroundPixel = (int) gcvalues.background;
-    
-    // Get the current Font so we can set it back later
-    XGCValues valReturn;
-    XGetGCValues((Display*) m_display, (GC) m_gc, GCFont, &valReturn);
-    m_oldFont = (WXFont) valReturn.font;
+
+    m_backgroundPixel = gcvalues.background;
+

     SetBrush (* wxWHITE_BRUSH);
     SetPen (* wxBLACK_PEN);
     SetBrush (* wxWHITE_BRUSH);
     SetPen (* wxBLACK_PEN);

-    SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));    
-};
+    SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
+}

 
 

-wxMemoryDC::wxMemoryDC( wxDC* dc )
+wxMemoryDCImpl::wxMemoryDCImpl(wxMemoryDC *owner, wxDC* dc)
+              : wxWindowDCImpl(owner)

 {
 {

-    m_ok = TRUE;
+    m_ok = true;

     if (dc && dc->IsKindOf(CLASSINFO(wxWindowDC)))
     if (dc && dc->IsKindOf(CLASSINFO(wxWindowDC)))

-        m_display = ((wxWindowDC*)dc)->GetDisplay();
+        m_display = ((wxWindowDCImpl *)dc->GetImpl())->GetDisplay();

     else
         m_display = wxGetDisplay();
     else
         m_display = wxGetDisplay();

-    
+

     Display* display = (Display*) m_display;
     Display* display = (Display*) m_display;

-    
+

     XGCValues gcvalues;
     gcvalues.foreground = BlackPixel (display, DefaultScreen (display));
     gcvalues.background = WhitePixel (display, DefaultScreen (display));
     XGCValues gcvalues;
     gcvalues.foreground = BlackPixel (display, DefaultScreen (display));
     gcvalues.background = WhitePixel (display, DefaultScreen (display));


@@ -83,34 +80,30 @@ wxMemoryDC::wxMemoryDC( wxDC* dc )
     m_gc = (WXGC) XCreateGC (display, RootWindow (display, DefaultScreen (display)),
         GCForeground | GCBackground | GCGraphicsExposures | GCLineWidth | GCSubwindowMode,
         &gcvalues);
     m_gc = (WXGC) XCreateGC (display, RootWindow (display, DefaultScreen (display)),
         GCForeground | GCBackground | GCGraphicsExposures | GCLineWidth | GCSubwindowMode,
         &gcvalues);

-    
-    m_backgroundPixel = (int) gcvalues.background;
-    
-    // Get the current Font so we can set it back later
-    XGCValues valReturn;
-    XGetGCValues((Display*) m_display, (GC) m_gc, GCFont, &valReturn);
-    m_oldFont = (WXFont) valReturn.font;
+
+    m_backgroundPixel = gcvalues.background;
+

     SetBrush (* wxWHITE_BRUSH);
     SetPen (* wxBLACK_PEN);
     SetBrush (* wxWHITE_BRUSH);
     SetPen (* wxBLACK_PEN);

-};
+}

 
 

-wxMemoryDC::~wxMemoryDC(void)
+wxMemoryDCImpl::~wxMemoryDCImpl(void)

 {
 {

-};
+}

 
 

-void wxMemoryDC::SelectObject( const wxBitmap& bitmap )
+void wxMemoryDCImpl::DoSelect( const wxBitmap& bitmap )

 {
     m_bitmap = bitmap;
 {
     m_bitmap = bitmap;

-    
+

     if (m_gc)
         XFreeGC((Display*) m_display, (GC) m_gc);
     m_gc = (WXGC) NULL;
     if (m_gc)
         XFreeGC((Display*) m_display, (GC) m_gc);
     m_gc = (WXGC) NULL;

-    
-    if (m_bitmap.Ok() && (bitmap.GetDisplay() == m_display))
+
+    if (m_bitmap.IsOk() && (bitmap.GetDisplay() == m_display))

     {
         m_pixmap = m_bitmap.GetDrawable();
         Display* display = (Display*) m_display;
     {
         m_pixmap = m_bitmap.GetDrawable();
         Display* display = (Display*) m_display;

-        
+

         XGCValues gcvalues;
         gcvalues.foreground = BlackPixel (display, DefaultScreen (display));
         gcvalues.background = WhitePixel (display, DefaultScreen (display));
         XGCValues gcvalues;
         gcvalues.foreground = BlackPixel (display, DefaultScreen (display));
         gcvalues.background = WhitePixel (display, DefaultScreen (display));


@@ -120,34 +113,23 @@ void wxMemoryDC::SelectObject( const wxBitmap& bitmap )
         m_gc = (WXGC) XCreateGC (display, (Drawable)m_pixmap/* RootWindow (display, DefaultScreen (display)) */,
             GCForeground | GCBackground | GCGraphicsExposures | GCLineWidth | GCSubwindowMode,
             &gcvalues);
         m_gc = (WXGC) XCreateGC (display, (Drawable)m_pixmap/* RootWindow (display, DefaultScreen (display)) */,
             GCForeground | GCBackground | GCGraphicsExposures | GCLineWidth | GCSubwindowMode,
             &gcvalues);

-        
-        m_backgroundPixel = (int) gcvalues.background;
-        m_ok = TRUE;
-        
-        // Get the current Font so we can set it back later
-        XGCValues valReturn;
-        XGetGCValues((Display*) m_display, (GC) m_gc, GCFont, &valReturn);
-        m_oldFont = (WXFont) valReturn.font;
-        
-        bool oldOpt = GetOptimization();
-        SetOptimization(FALSE);
-        
+
+        m_backgroundPixel = gcvalues.background;
+        m_ok = true;
+

         SetBrush (* wxWHITE_BRUSH);
         SetPen (* wxBLACK_PEN);
         SetBrush (* wxWHITE_BRUSH);
         SetPen (* wxBLACK_PEN);

-        
-        SetOptimization(oldOpt);
-        

     }
     else
     {
     }
     else
     {

-        m_ok = FALSE;
+        m_ok = false;

         m_pixmap = (WXPixmap) 0;
     };
         m_pixmap = (WXPixmap) 0;
     };

-};
+}

 
 

-void wxMemoryDC::DoGetSize( int *width, int *height ) const
+void wxMemoryDCImpl::DoGetSize( int *width, int *height ) const

 {
 {

-    if (m_bitmap.Ok())
+    if (m_bitmap.IsOk())

     {
         if (width) (*width) = m_bitmap.GetWidth();
         if (height) (*height) = m_bitmap.GetHeight();
     {
         if (width) (*width) = m_bitmap.GetWidth();
         if (height) (*height) = m_bitmap.GetHeight();


@@ -157,6 +139,4 @@ void wxMemoryDC::DoGetSize( int *width, int *height ) const
         if (width) (*width) = 0;
         if (height) (*height) = 0;
     };
         if (width) (*width) = 0;
         if (height) (*height) = 0;
     };

-};
-
-
+}