Fixed a crash when GetMonthControl returns NULL

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

diff --git a/src/x11/data.cpp b/src/x11/data.cpp
index eb1c8e0713066ae5d82fedcb96ce7ae53fcc7f19..3cbdf91ef430ae406a549f14accd8e7c4fed4fa0 100644 (file)
--- a/src/x11/data.cpp
+++ b/src/x11/data.cpp
@@ -18,9 +18,6 @@
 
 #define _MAXPATHLEN 500
 
 
 #define _MAXPATHLEN 500
 

-// Useful buffer, initialized in CommonInit
-char *wxBuffer = NULL;
-

 // Windows List
 wxWindowList wxTopLevelWindows;
 
 // Windows List
 wxWindowList wxTopLevelWindows;
 


@@ -89,6 +86,7 @@ wxFont   wxNullFont;
 wxColour wxNullColour;
 
 // Default window names
 wxColour wxNullColour;
 
 // Default window names

+const char *wxControlNameStr = "control";

 const char *wxButtonNameStr = "button";
 const char *wxCanvasNameStr = "canvas";
 const char *wxCheckBoxNameStr = "check";
 const char *wxButtonNameStr = "button";
 const char *wxCanvasNameStr = "canvas";
 const char *wxCheckBoxNameStr = "check";


@@ -116,15 +114,10 @@ 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 = "";
-#endif

 const char *wxGetTextFromUserPromptStr = "Input Text";
 const char *wxMessageBoxCaptionStr = "Message";
 const char *wxFileSelectorPromptStr = "Select a file";
 const char *wxFileSelectorDefaultWildcardStr = "*.*";
 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 = "/";
 const wxChar *wxTreeCtrlNameStr = wxT("wxTreeCtrl");
 const char *wxDirDialogNameStr = "wxDirCtrl";
 const char *wxDirDialogDefaultFolderStr = "/";
 const wxChar *wxTreeCtrlNameStr = wxT("wxTreeCtrl");