added wxAppTraits::GetStandardCmdLineOptions() allowing to add the description of...

[wxWidgets.git] / src / common / datacmn.cpp

diff --git a/src/common/datacmn.cpp b/src/common/datacmn.cpp
index d2b5ba4544f5a4f5d6acadb2fc424356549cd270..fdc0a9a7408034b567463d841d9f321b921934e2 100644 (file)
--- a/src/common/datacmn.cpp
+++ b/src/common/datacmn.cpp
@@ -25,136 +25,59 @@
 #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;
-wxBitmapList *wxTheBitmapList = NULL;
-wxColourDatabase *wxTheColourDatabase = NULL;
-
-// Stock objects
-wxFont *wxNORMAL_FONT;
-wxFont *wxSMALL_FONT;
-wxFont *wxITALIC_FONT;
-wxFont *wxSWISS_FONT;
-
-wxPen *wxRED_PEN;
-wxPen *wxCYAN_PEN;
-wxPen *wxGREEN_PEN;
-wxPen *wxBLACK_PEN;
-wxPen *wxWHITE_PEN;
-wxPen *wxTRANSPARENT_PEN;
-wxPen *wxBLACK_DASHED_PEN;
-wxPen *wxGREY_PEN;
-wxPen *wxMEDIUM_GREY_PEN;
-wxPen *wxLIGHT_GREY_PEN;
-
-wxBrush *wxBLUE_BRUSH;
-wxBrush *wxGREEN_BRUSH;
-wxBrush *wxWHITE_BRUSH;
-wxBrush *wxBLACK_BRUSH;
-wxBrush *wxTRANSPARENT_BRUSH;
-wxBrush *wxCYAN_BRUSH;
-wxBrush *wxRED_BRUSH;
-wxBrush *wxGREY_BRUSH;
-wxBrush *wxMEDIUM_GREY_BRUSH;
-wxBrush *wxLIGHT_GREY_BRUSH;
-
-wxColour *wxBLACK;
-wxColour *wxWHITE;
-wxColour *wxRED;
-wxColour *wxBLUE;
-wxColour *wxGREEN;
-wxColour *wxCYAN;
-wxColour *wxLIGHT_GREY;
-
-wxCursor *wxSTANDARD_CURSOR = NULL;
-wxCursor *wxHOURGLASS_CURSOR = NULL;
-wxCursor *wxCROSS_CURSOR = 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
-WXDLLEXPORT_DATA(const wxChar *) wxControlNameStr = wxT("control");
-WXDLLEXPORT_DATA(const wxChar *) wxButtonNameStr = wxT("button");
-WXDLLEXPORT_DATA(const wxChar *) wxCanvasNameStr = wxT("canvas");
-WXDLLEXPORT_DATA(const wxChar *) wxCheckBoxNameStr = wxT("check");
-WXDLLEXPORT_DATA(const wxChar *) wxChoiceNameStr = wxT("choice");
-WXDLLEXPORT_DATA(const wxChar *) wxComboBoxNameStr = wxT("comboBox");
-WXDLLEXPORT_DATA(const wxChar *) wxDialogNameStr = wxT("dialog");
-WXDLLEXPORT_DATA(const wxChar *) wxFrameNameStr = wxT("frame");
-WXDLLEXPORT_DATA(const wxChar *) wxGaugeNameStr = wxT("gauge");
-WXDLLEXPORT_DATA(const wxChar *) wxStaticBoxNameStr = wxT("groupBox");
-WXDLLEXPORT_DATA(const wxChar *) wxListBoxNameStr = wxT("listBox");
-WXDLLEXPORT_DATA(const wxChar *) wxStaticTextNameStr = wxT("message");
-WXDLLEXPORT_DATA(const wxChar *) wxStaticBitmapNameStr = wxT("message");
-WXDLLEXPORT_DATA(const wxChar *) wxMultiTextNameStr = wxT("multitext");
-WXDLLEXPORT_DATA(const wxChar *) wxPanelNameStr = wxT("panel");
-WXDLLEXPORT_DATA(const wxChar *) wxRadioBoxNameStr = wxT("radioBox");
-WXDLLEXPORT_DATA(const wxChar *) wxRadioButtonNameStr = wxT("radioButton");
-WXDLLEXPORT_DATA(const wxChar *) wxBitmapRadioButtonNameStr = wxT("radioButton");
-WXDLLEXPORT_DATA(const wxChar *) wxScrollBarNameStr = wxT("scrollBar");
-WXDLLEXPORT_DATA(const wxChar *) wxSliderNameStr = wxT("slider");
-WXDLLEXPORT_DATA(const wxChar *) wxStaticNameStr = wxT("static");
-WXDLLEXPORT_DATA(const wxChar *) wxTextCtrlWindowNameStr = wxT("textWindow");
-WXDLLEXPORT_DATA(const wxChar *) wxTextCtrlNameStr = wxT("text");
-WXDLLEXPORT_DATA(const wxChar *) wxVirtListBoxNameStr = wxT("virtListBox");
-WXDLLEXPORT_DATA(const wxChar *) wxButtonBarNameStr = wxT("buttonbar");
-WXDLLEXPORT_DATA(const wxChar *) wxEnhDialogNameStr = wxT("Shell");
-WXDLLEXPORT_DATA(const wxChar *) wxToolBarNameStr = wxT("toolbar");
-WXDLLEXPORT_DATA(const wxChar *) wxStatusLineNameStr = wxT("status_line");
-WXDLLEXPORT_DATA(const wxChar *) wxGetTextFromUserPromptStr = wxT("Input Text");
-WXDLLEXPORT_DATA(const wxChar *) wxMessageBoxCaptionStr = wxT("Message");
-WXDLLEXPORT_DATA(const wxChar *) wxFileSelectorPromptStr = wxT("Select a file");
-WXDLLEXPORT_DATA(const wxChar *) wxFileSelectorDefaultWildcardStr =
-#if defined(__WXMSW__) || defined(__WXOS2__)
+extern WXDLLEXPORT_DATA(const wxChar) wxButtonNameStr[] = wxT("button");
+extern WXDLLEXPORT_DATA(const wxChar) wxCheckBoxNameStr[] = wxT("check");
+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) wxStaticBoxNameStr[] = wxT("groupBox");
+extern WXDLLEXPORT_DATA(const wxChar) wxListBoxNameStr[] = wxT("listBox");
+extern WXDLLEXPORT_DATA(const wxChar) wxStaticLineNameStr[] = wxT("staticLine");
+extern WXDLLEXPORT_DATA(const wxChar) wxStaticTextNameStr[] = wxT("staticText");
+extern WXDLLEXPORT_DATA(const wxChar) wxStaticBitmapNameStr[] = wxT("staticBitmap");
+extern WXDLLEXPORT_DATA(const wxChar) wxNotebookNameStr[] = wxT("notebook");
+extern WXDLLEXPORT_DATA(const wxChar) wxPanelNameStr[] = wxT("panel");
+extern WXDLLEXPORT_DATA(const wxChar) wxRadioBoxNameStr[] = wxT("radioBox");
+extern WXDLLEXPORT_DATA(const wxChar) wxRadioButtonNameStr[] = wxT("radioButton");
+extern WXDLLEXPORT_DATA(const wxChar) wxBitmapRadioButtonNameStr[] = wxT("radioButton");
+extern WXDLLEXPORT_DATA(const wxChar) wxScrollBarNameStr[] = wxT("scrollBar");
+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) wxToolBarNameStr[] = wxT("toolbar");
+
+// Default messages
+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[] =
+#if defined(__WXMSW__) || defined(__OS2__)
     wxT("*.*")
 #else // Unix/Mac
     wxT("*")
 #endif
     ;
-WXDLLEXPORT_DATA(const wxChar *) wxTreeCtrlNameStr = wxT("treeCtrl");
-WXDLLEXPORT_DATA(const wxChar *) wxDirDialogNameStr = wxT("wxDirCtrl");
-WXDLLEXPORT_DATA(const wxChar *) wxDirDialogDefaultFolderStr = wxT("/");
+extern WXDLLEXPORT_DATA(const wxChar) wxDirDialogNameStr[] = wxT("wxDirCtrl");
+extern WXDLLEXPORT_DATA(const wxChar) wxDirDialogDefaultFolderStr[] = wxT("/");
 
-#if defined(__WXMSW__) || defined(__WXOS2__)
+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);
-