wxDC::SetFont can now handle invalid font and doesn't assert anymore (other ports...

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

diff --git a/src/motif/data.cpp b/src/motif/data.cpp
index da2257c7391d6f075fe1d8f2f6d8ffd0bf4d9db3..eb1c8e0713066ae5d82fedcb96ce7ae53fcc7f19 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";
@@ -131,22 +127,12 @@ const char *wxInternalErrorStr = "wxWindows Internal Error";
 const char *wxFatalErrorStr = "wxWindows Fatal Error";
 const char *wxDirDialogNameStr = "wxDirCtrl";
 const char *wxDirDialogDefaultFolderStr = "/";
+const wxChar *wxTreeCtrlNameStr = wxT("wxTreeCtrl");
 
 // See wx/utils.h
 const char *wxFloatToStringStr = "%.2f";
 const char *wxDoubleToStringStr = "%.2f";
 
-#if wxUSE_SHARED_LIBRARY
-///// Event tables (also must be in one, statically-linked file for shared libraries)
-
-// This is the base, wxEvtHandler 'bootstrap' code which is expanded manually here
-const wxEventTable *wxEvtHandler::GetEventTable() const { return &wxEvtHandler::sm_eventTable; }
-
-const wxEventTable wxEvtHandler::sm_eventTable =
-       { NULL, &wxEvtHandler::sm_eventTableEntries[0] };
-
-const wxEventTableEntry wxEvtHandler::sm_eventTableEntries[] = { { 0, 0, 0, NULL } };
-#endif
 
 const wxSize wxDefaultSize(-1, -1);
 const wxPoint wxDefaultPosition(-1, -1);