OSX only (a runtime check would be preferable as Kevin mentioned

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

diff --git a/src/motif/clipbrd.cpp b/src/motif/clipbrd.cpp
index 9c09d7ff2bd754221646b0ca70975e55e7042ba0..4af95a45ad40e73fbfca02cd8345d6c7477e67cb 100644 (file)
--- a/src/motif/clipbrd.cpp
+++ b/src/motif/clipbrd.cpp
@@ -9,11 +9,23 @@
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation
 #pragma implementation "clipbrd.h"
 #endif
 
 #pragma implementation
 #pragma implementation "clipbrd.h"
 #endif
 

+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __VMS
+#include "wx/vms_x_fix.h"
+#define XtWindow XTWINDOW
+#define XtScreen XTSCREEN
+#define XtParent XTPARENT
+#define XtIsRealized XTISREALIZED
+#define XtDisplay XTDISPLAY
+#endif
+

 #include "wx/defs.h"
 
 #if wxUSE_CLIPBOARD
 #include "wx/defs.h"
 
 #if wxUSE_CLIPBOARD


@@ -27,6 +39,7 @@
 
 #ifdef __VMS__
 #pragma message disable nosimpint
 
 #ifdef __VMS__
 #pragma message disable nosimpint

+

 #endif
 #include <Xm/Xm.h>
 #include <Xm/CutPaste.h>
 #endif
 #include <Xm/Xm.h>
 #include <Xm/CutPaste.h>


@@ -163,9 +176,13 @@ struct wxDataIdToDataObject
 WX_DEFINE_LIST(wxDataObjectList);
 WX_DEFINE_LIST(wxDataIdToDataObjectList);
 
 WX_DEFINE_LIST(wxDataObjectList);
 WX_DEFINE_LIST(wxDataIdToDataObjectList);
 

+#if wxCHECK_LESSTIF()
+static void wxClipboardCallback( Widget widget, int* data_id,
+                                 int* priv, int* reason );
+#else

 static void wxClipboardCallback( Widget widget, long* data_id,
                                  long* priv, int* reason );
 static void wxClipboardCallback( Widget widget, long* data_id,
                                  long* priv, int* reason );

-
+#endif

 
 IMPLEMENT_DYNAMIC_CLASS(wxClipboard,wxObject)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxClipboard,wxObject)
 


@@ -181,7 +198,7 @@ wxClipboard::~wxClipboard()
 
 void wxClipboard::Clear()
 {
 
 void wxClipboard::Clear()
 {

-    wxDataObjectList::Node* node = m_data.GetFirst();
+    wxDataObjectList::compatibility_iterator node = m_data.GetFirst();

     while (node)
     {
         delete node->GetData();
     while (node)
     {
         delete node->GetData();


@@ -189,7 +206,7 @@ void wxClipboard::Clear()
     }
     m_data.Clear();
 
     }
     m_data.Clear();
 

-    for( wxDataIdToDataObjectList::Node* node2 = m_idToObject.GetFirst();
+    for( wxDataIdToDataObjectList::compatibility_iterator node2 = m_idToObject.GetFirst();

          node2; node2 = node2->GetNext() )
         delete node->GetData();
     m_idToObject.Clear();
          node2; node2 = node2->GetNext() )
         delete node->GetData();
     m_idToObject.Clear();


@@ -217,15 +234,20 @@ bool wxClipboard::SetData( wxDataObject *data )
 wxDECLARE_SCOPED_ARRAY( wxDataFormat, wxDataFormatScopedArray );
 wxDEFINE_SCOPED_ARRAY( wxDataFormat, wxDataFormatScopedArray );
 
 wxDECLARE_SCOPED_ARRAY( wxDataFormat, wxDataFormatScopedArray );
 wxDEFINE_SCOPED_ARRAY( wxDataFormat, wxDataFormatScopedArray );
 

+#if wxCHECK_LESSTIF()
+void wxClipboardCallback( Widget xwidget, int* data_id,
+                          int* priv, int* reason )
+#else

 void wxClipboardCallback( Widget xwidget, long* data_id,
                           long* priv, int* reason )
 void wxClipboardCallback( Widget xwidget, long* data_id,
                           long* priv, int* reason )

+#endif

 {
     Display* xdisplay = XtDisplay( xwidget );
     Window xwindow = XtWindow( xwidget );
     wxDataObject* dobj = NULL;
     size_t size = 0;
 
 {
     Display* xdisplay = XtDisplay( xwidget );
     Window xwindow = XtWindow( xwidget );
     wxDataObject* dobj = NULL;
     size_t size = 0;
 

-    for( wxDataIdToDataObjectList::Node* node2 =
+    for( wxDataIdToDataObjectList::compatibility_iterator node2 =

              wxTheClipboard->m_idToObject.GetFirst();
          node2; node2 = node2->GetNext() )
     {
              wxTheClipboard->m_idToObject.GetFirst();
          node2; node2 = node2->GetNext() )
     {


@@ -261,7 +283,7 @@ bool wxClipboard::AddData( wxDataObject *data )
     m_data.Append( data );
 
     Display* xdisplay = wxGlobalDisplay();
     m_data.Append( data );
 
     Display* xdisplay = wxGlobalDisplay();

-    Widget xwidget = (Widget)wxTheApp->GetTopLevelWidget();
+    Widget xwidget = (Widget)wxTheApp->GetTopLevelRealizedWidget();

     Window xwindow = XtWindow( xwidget );
     wxXmString label( wxTheApp->GetAppName() );
     Time timestamp = XtLastTimestampProcessed( xdisplay );
     Window xwindow = XtWindow( xwidget );
     wxXmString label( wxTheApp->GetAppName() );
     Time timestamp = XtLastTimestampProcessed( xdisplay );


@@ -311,7 +333,7 @@ void wxClipboard::Close()
 bool wxClipboard::IsSupported(const wxDataFormat& format)
 {
     Display* xdisplay = wxGlobalDisplay();
 bool wxClipboard::IsSupported(const wxDataFormat& format)
 {
     Display* xdisplay = wxGlobalDisplay();

-    Window xwindow = XtWindow( (Widget)wxTheApp->GetTopLevelWidget() );
+    Window xwindow = XtWindow( (Widget)wxTheApp->GetTopLevelRealizedWidget() );

     bool isSupported = false;
     int retval, count;
     unsigned long  max_name_length;
     bool isSupported = false;
     int retval, count;
     unsigned long  max_name_length;


@@ -371,7 +393,7 @@ bool wxClipboard::GetData( wxDataObject& data )
     wxCHECK_MSG( m_open, false, "clipboard not open" );
 
     Display* xdisplay = wxGlobalDisplay();
     wxCHECK_MSG( m_open, false, "clipboard not open" );
 
     Display* xdisplay = wxGlobalDisplay();

-    Window xwindow = XtWindow( (Widget)wxTheApp->GetTopLevelWidget() );
+    Window xwindow = XtWindow( (Widget)wxTheApp->GetTopLevelRealizedWidget() );

     Time timestamp = XtLastTimestampProcessed( xdisplay );
 
     wxDataFormat chosenFormat;
     Time timestamp = XtLastTimestampProcessed( xdisplay );
 
     wxDataFormat chosenFormat;