X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9cdf21473aeb026d6734cd15aae00f23613c7e06..cd7d36c065d638f48cff0845a43e35b9ed1e25f6:/src/common/datacmn.cpp

diff --git a/src/common/datacmn.cpp b/src/common/datacmn.cpp
index 1f157aae68..2b88eae6cc 100644
--- a/src/common/datacmn.cpp
+++ b/src/common/datacmn.cpp
@@ -25,59 +25,27 @@
 #endif
 
 #ifndef WX_PRECOMP
-    #include "wx/wx.h"
-    #include "wx/treectrl.h"
 #endif // WX_PRECOMP
 
+#include "wx/accel.h"
+
 // ============================================================================
 // implementation
 // ============================================================================
 
-// Useful buffer, initialized in wxCommonInit
-wxChar *wxBuffer = NULL;
-
-// Windows List
-wxWindowList wxTopLevelWindows;
-
-// List of windows pending deletion
-wxList WXDLLEXPORT wxPendingDelete;
-
-int wxPageNumber;
-
-// GDI Object Lists
-wxFontList   *wxTheFontList = NULL;
-wxPenList    *wxThePenList = NULL;
-wxBrushList  *wxTheBrushList = NULL;
-wxColourDatabase *wxTheColourDatabase = NULL;
-
 // 'Null' objects
 #if wxUSE_ACCEL
 wxAcceleratorTable wxNullAcceleratorTable;
 #endif // wxUSE_ACCEL
 
-wxBitmap  wxNullBitmap;
-wxIcon    wxNullIcon;
-wxCursor  wxNullCursor;
-wxPen     wxNullPen;
-wxBrush   wxNullBrush;
-#if wxUSE_PALETTE
-wxPalette wxNullPalette;
-#endif // wxUSE_PALETTE
-wxFont    wxNullFont;
-wxColour  wxNullColour;
-
 // Default window names
-extern WXDLLEXPORT_DATA(const wxChar) wxControlNameStr[] = wxT("control");
 extern WXDLLEXPORT_DATA(const wxChar) wxButtonNameStr[] = wxT("button");
 extern WXDLLEXPORT_DATA(const wxChar) wxCheckBoxNameStr[] = wxT("check");
-extern WXDLLEXPORT_DATA(const wxChar) wxChoiceNameStr[] = wxT("choice");
 extern WXDLLEXPORT_DATA(const wxChar) wxComboBoxNameStr[] = wxT("comboBox");
 extern WXDLLEXPORT_DATA(const wxChar) wxDialogNameStr[] = wxT("dialog");
 extern WXDLLEXPORT_DATA(const wxChar) wxFrameNameStr[] = wxT("frame");
-extern WXDLLEXPORT_DATA(const wxChar) wxGaugeNameStr[] = wxT("gauge");
 extern WXDLLEXPORT_DATA(const wxChar) wxStaticBoxNameStr[] = wxT("groupBox");
 extern WXDLLEXPORT_DATA(const wxChar) wxListBoxNameStr[] = wxT("listBox");
-extern WXDLLEXPORT_DATA(const wxChar) wxListCtrlNameStr[] = wxT("listCtrl");
 extern WXDLLEXPORT_DATA(const wxChar) wxStaticTextNameStr[] = wxT("staticText");
 extern WXDLLEXPORT_DATA(const wxChar) wxStaticBitmapNameStr[] = wxT("staticBitmap");
 extern WXDLLEXPORT_DATA(const wxChar) wxNotebookNameStr[] = wxT("notebook");
@@ -90,15 +58,12 @@ extern WXDLLEXPORT_DATA(const wxChar) wxSliderNameStr[] = wxT("slider");
 extern WXDLLEXPORT_DATA(const wxChar) wxStatusLineNameStr[] = wxT("status_line");
 extern WXDLLEXPORT_DATA(const wxChar) wxTextCtrlNameStr[] = wxT("text");
 extern WXDLLEXPORT_DATA(const wxChar) wxTreeCtrlNameStr[] = wxT("treeCtrl");
-extern WXDLLEXPORT_DATA(const wxChar) wxEnhDialogNameStr[] = wxT("Shell");
 extern WXDLLEXPORT_DATA(const wxChar) wxToolBarNameStr[] = wxT("toolbar");
-extern WXDLLEXPORT_DATA(const wxChar) wxDataViewCtrlNameStr[] = wxT("dataviewCtrl");
 
 // Default messages
-extern WXDLLEXPORT_DATA(const wxChar) wxGetTextFromUserPromptStr[] = wxT("Input Text");
-extern WXDLLEXPORT_DATA(const wxChar) wxGetPasswordFromUserPromptStr[] = wxT("Enter Password");
 extern WXDLLEXPORT_DATA(const wxChar) wxMessageBoxCaptionStr[] = wxT("Message");
 extern WXDLLEXPORT_DATA(const wxChar) wxFileSelectorPromptStr[] = wxT("Select a file");
+extern WXDLLEXPORT_DATA(const wxChar) wxDirSelectorPromptStr[] = wxT("Select a directory");
 
 // Other default strings
 extern WXDLLEXPORT_DATA(const wxChar) wxFileSelectorDefaultWildcardStr[] =
@@ -111,11 +76,18 @@ extern WXDLLEXPORT_DATA(const wxChar) wxFileSelectorDefaultWildcardStr[] =
 extern WXDLLEXPORT_DATA(const wxChar) wxDirDialogNameStr[] = wxT("wxDirCtrl");
 extern WXDLLEXPORT_DATA(const wxChar) wxDirDialogDefaultFolderStr[] = wxT("/");
 
+extern WXDLLEXPORT_DATA(const wxChar) wxFileDialogNameStr[] = wxT("filedlg");
 #if defined(__WXMSW__) || defined(__OS2__)
 WXDLLEXPORT_DATA(const wxChar *) wxUserResourceStr = wxT("TEXT");
 #endif
-
-
-const wxSize wxDefaultSize(wxDefaultCoord, wxDefaultCoord);
-const wxPoint wxDefaultPosition(wxDefaultCoord, wxDefaultCoord);
+extern WXDLLEXPORT_DATA(const wxChar) wxColourPickerCtrlNameStr[] = wxT("colourpicker");
+extern WXDLLEXPORT_DATA(const wxChar) wxColourPickerWidgetNameStr[] = wxT("colourpickerwidget");
+extern WXDLLEXPORT_DATA(const wxChar) wxFontPickerCtrlNameStr[] = wxT("fontpicker");
+extern WXDLLEXPORT_DATA(const wxChar) wxFontPickerWidgetNameStr[] = wxT("fontpickerwidget");
+extern WXDLLEXPORT_DATA(const wxChar) wxFilePickerCtrlNameStr[] = wxT("filepicker");
+extern WXDLLEXPORT_DATA(const wxChar) wxFilePickerWidgetNameStr[] = wxT("filepickerwidget");
+extern WXDLLEXPORT_DATA(const wxChar) wxDirPickerCtrlNameStr[] = wxT("dirpicker");
+extern WXDLLEXPORT_DATA(const wxChar) wxDirPickerWidgetNameStr[] = wxT("dirpickerwidget");
+extern WXDLLEXPORT_DATA(const wxChar) wxFilePickerWidgetLabel[] = wxT("Browse");
+extern WXDLLEXPORT_DATA(const wxChar) wxDirPickerWidgetLabel[] = wxT("Browse");