[ 1509599 ] 'Split pickers page in widgets sample' with more icons and rebaking.

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

diff --git a/src/motif/clipbrd.cpp b/src/motif/clipbrd.cpp
index 94cbda42b31b7b73a7f925e66c8daec00f1c6151..7a5763a69b26d9c2c6c15859ec1b7cdd8a98508a 100644 (file)
--- a/src/motif/clipbrd.cpp
+++ b/src/motif/clipbrd.cpp
@@ -21,14 +21,16 @@
 #define XtDisplay XTDISPLAY
 #endif
 
 #define XtDisplay XTDISPLAY
 #endif
 

-#include "wx/defs.h"
-

 #if wxUSE_CLIPBOARD
 
 #if wxUSE_CLIPBOARD
 

-#include "wx/app.h"
-#include "wx/bitmap.h"
-#include "wx/utils.h"

 #include "wx/clipbrd.h"
 #include "wx/clipbrd.h"

+
+#ifndef WX_PRECOMP
+    #include "wx/app.h"
+    #include "wx/utils.h"
+    #include "wx/bitmap.h"
+#endif
+

 #include "wx/dataobj.h"
 #include "wx/ptr_scpd.h"
 
 #include "wx/dataobj.h"
 #include "wx/ptr_scpd.h"
 


@@ -168,8 +170,8 @@ struct wxDataIdToDataObject
 
 #include "wx/listimpl.cpp"
 
 
 #include "wx/listimpl.cpp"
 

-WX_DEFINE_LIST(wxDataObjectList);
-WX_DEFINE_LIST(wxDataIdToDataObjectList);
+WX_DEFINE_LIST(wxDataObjectList)
+WX_DEFINE_LIST(wxDataIdToDataObjectList)

 
 extern "C"
 {
 
 extern "C"
 {


@@ -231,8 +233,8 @@ bool wxClipboard::SetData( wxDataObject *data )
     return AddData( data );
 }
 
     return AddData( 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,
 
 #if wxCHECK_LESSTIF()
 void wxClipboardCallback( Widget xwidget, int* data_id,