some conflicts resolved

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

diff --git a/src/motif/data.cpp b/src/motif/data.cpp
index da2257c7391d6f075fe1d8f2f6d8ffd0bf4d9db3..51f3690ee5833bc161947fa7e2c65a5c94c34f56 100644 (file)
--- a/src/motif/data.cpp
+++ b/src/motif/data.cpp
@@ -27,12 +27,6 @@ wxWindowList wxTopLevelWindows;
 // List of windows pending deletion
 wxList wxPendingDelete;
 
-#if wxUSE_THREADS
-// List of events pending propagation
-wxList *wxPendingEvents = NULL;
-wxCriticalSection *wxPendingEventsLocker = NULL;
-#endif
-
 int wxPageNumber;
 
 // GDI Object Lists
@@ -122,7 +116,9 @@ const char *wxButtonBarNameStr = "buttonbar";
 const char *wxEnhDialogNameStr = "Shell";
 const char *wxToolBarNameStr = "toolbar";
 const char *wxStatusLineNameStr = "status_line";
+#if 0  // this is defined in string.cpp
 const char *wxEmptyString = "";
+#endif
 const char *wxGetTextFromUserPromptStr = "Input Text";
 const char *wxMessageBoxCaptionStr = "Message";
 const char *wxFileSelectorPromptStr = "Select a file";