Don't do the wx cleanup if wxPython didn't do the initialization.

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

diff --git a/src/x11/data.cpp b/src/x11/data.cpp
index b094b7389edfb5593e0acc0536bdedb42f43a98d..3cbdf91ef430ae406a549f14accd8e7c4fed4fa0 100644 (file)
--- a/src/x11/data.cpp
+++ b/src/x11/data.cpp
@@ -86,6 +86,7 @@ wxFont   wxNullFont;
 wxColour wxNullColour;
 
 // Default window names
+const char *wxControlNameStr = "control";
 const char *wxButtonNameStr = "button";
 const char *wxCanvasNameStr = "canvas";
 const char *wxCheckBoxNameStr = "check";
@@ -113,9 +114,6 @@ 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";