some conflicts resolved

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

diff --git a/src/motif/data.cpp b/src/motif/data.cpp
index 4767438a1cfd15c5d5912d8a9fe3a22c51943e71..51f3690ee5833bc161947fa7e2c65a5c94c34f56 100644 (file)
--- a/src/motif/data.cpp
+++ b/src/motif/data.cpp
@@ -6,7 +6,7 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

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

 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__


@@ -22,17 +22,11 @@
 char *wxBuffer = NULL;
 
 // Windows List
 char *wxBuffer = NULL;
 
 // Windows List

-wxList wxTopLevelWindows;
+wxWindowList wxTopLevelWindows;

 
 // List of windows pending deletion
 wxList wxPendingDelete;
 
 
 // List of windows pending deletion
 wxList wxPendingDelete;
 

-#if wxUSE_THREADS
-// List of events pending propagation
-wxList wxPendingEvents;
-wxCriticalSection wxPendingEventsLocker;
-#endif
-

 int wxPageNumber;
 
 // GDI Object Lists
 int wxPageNumber;
 
 // GDI Object Lists


@@ -122,13 +116,17 @@ const char *wxButtonBarNameStr = "buttonbar";
 const char *wxEnhDialogNameStr = "Shell";
 const char *wxToolBarNameStr = "toolbar";
 const char *wxStatusLineNameStr = "status_line";
 const char *wxEnhDialogNameStr = "Shell";
 const char *wxToolBarNameStr = "toolbar";
 const char *wxStatusLineNameStr = "status_line";

+#if 0  // this is defined in string.cpp

 const char *wxEmptyString = "";
 const char *wxEmptyString = "";

+#endif

 const char *wxGetTextFromUserPromptStr = "Input Text";
 const char *wxMessageBoxCaptionStr = "Message";
 const char *wxFileSelectorPromptStr = "Select a file";
 const char *wxFileSelectorDefaultWildcardStr = "*.*";
 const char *wxInternalErrorStr = "wxWindows Internal Error";
 const char *wxFatalErrorStr = "wxWindows Fatal Error";
 const char *wxGetTextFromUserPromptStr = "Input Text";
 const char *wxMessageBoxCaptionStr = "Message";
 const char *wxFileSelectorPromptStr = "Select a file";
 const char *wxFileSelectorDefaultWildcardStr = "*.*";
 const char *wxInternalErrorStr = "wxWindows Internal Error";
 const char *wxFatalErrorStr = "wxWindows Fatal Error";

+const char *wxDirDialogNameStr = "wxDirCtrl";
+const char *wxDirDialogDefaultFolderStr = "/";

 
 // See wx/utils.h
 const char *wxFloatToStringStr = "%.2f";
 
 // See wx/utils.h
 const char *wxFloatToStringStr = "%.2f";