X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/63ec432bd7b9c93961e85e871bcb31758364a634..fa3d4aaf0fdffa51372d15f17862cb7081687107:/src/common/datacmn.cpp diff --git a/src/common/datacmn.cpp b/src/common/datacmn.cpp index 1b75320de4..10baf57320 100644 --- a/src/common/datacmn.cpp +++ b/src/common/datacmn.cpp @@ -25,144 +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 -extern WXDLLEXPORT_DATA(const wxChar) wxControlNameStr[] = wxT("control"); -extern WXDLLEXPORT_DATA(const wxChar) wxButtonNameStr[] = wxT("button"); -extern WXDLLEXPORT_DATA(const wxChar) wxButtonBarNameStr[] = wxT("buttonbar"); -extern WXDLLEXPORT_DATA(const wxChar) wxCanvasNameStr[] = wxT("canvas"); -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) wxMultiTextNameStr[] = wxT("multitext"); -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) wxStaticNameStr[] = wxT("static"); -extern WXDLLEXPORT_DATA(const wxChar) wxStatusLineNameStr[] = wxT("status_line"); -extern WXDLLEXPORT_DATA(const wxChar) wxTextCtrlWindowNameStr[] = wxT("textWindow"); -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) wxVirtListBoxNameStr[] = wxT("virtListBox"); -extern WXDLLEXPORT_DATA(const wxChar) wxDataViewCtrlNameStr[] = wxT("dataviewCtrl"); +extern WXDLLEXPORT_DATA(const char) wxButtonNameStr[] = "button"; +extern WXDLLEXPORT_DATA(const char) wxCheckBoxNameStr[] = "check"; +extern WXDLLEXPORT_DATA(const char) wxComboBoxNameStr[] = "comboBox"; +extern WXDLLEXPORT_DATA(const char) wxDialogNameStr[] = "dialog"; +extern WXDLLEXPORT_DATA(const char) wxFrameNameStr[] = "frame"; +extern WXDLLEXPORT_DATA(const char) wxStaticBoxNameStr[] = "groupBox"; +extern WXDLLEXPORT_DATA(const char) wxListBoxNameStr[] = "listBox"; +extern WXDLLEXPORT_DATA(const char) wxStaticLineNameStr[] = "staticLine"; +extern WXDLLEXPORT_DATA(const char) wxStaticTextNameStr[] = "staticText"; +extern WXDLLEXPORT_DATA(const char) wxStaticBitmapNameStr[] = "staticBitmap"; +extern WXDLLEXPORT_DATA(const char) wxNotebookNameStr[] = "notebook"; +extern WXDLLEXPORT_DATA(const char) wxPanelNameStr[] = "panel"; +extern WXDLLEXPORT_DATA(const char) wxRadioBoxNameStr[] = "radioBox"; +extern WXDLLEXPORT_DATA(const char) wxRadioButtonNameStr[] = "radioButton"; +extern WXDLLEXPORT_DATA(const char) wxBitmapRadioButtonNameStr[] = "radioButton"; +extern WXDLLEXPORT_DATA(const char) wxScrollBarNameStr[] = "scrollBar"; +extern WXDLLEXPORT_DATA(const char) wxSliderNameStr[] = "slider"; +extern WXDLLEXPORT_DATA(const char) wxStatusLineNameStr[] = "status_line"; +extern WXDLLEXPORT_DATA(const char) wxTextCtrlNameStr[] = "text"; +extern WXDLLEXPORT_DATA(const char) wxTreeCtrlNameStr[] = "treeCtrl"; +extern WXDLLEXPORT_DATA(const char) wxToolBarNameStr[] = "toolbar"; // 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 char) wxMessageBoxCaptionStr[] = "Message"; +extern WXDLLEXPORT_DATA(const char) wxFileSelectorPromptStr[] = "Select a file"; +extern WXDLLEXPORT_DATA(const char) wxDirSelectorPromptStr[] = "Select a directory"; // Other default strings -extern WXDLLEXPORT_DATA(const wxChar) wxFileSelectorDefaultWildcardStr[] = +extern WXDLLEXPORT_DATA(const char) wxFileSelectorDefaultWildcardStr[] = #if defined(__WXMSW__) || defined(__OS2__) - wxT("*.*") + "*.*" #else // Unix/Mac - wxT("*") + "*" #endif ; -extern WXDLLEXPORT_DATA(const wxChar) wxDirDialogNameStr[] = wxT("wxDirCtrl"); -extern WXDLLEXPORT_DATA(const wxChar) wxDirDialogDefaultFolderStr[] = wxT("/"); +extern WXDLLEXPORT_DATA(const char) wxDirDialogNameStr[] = "wxDirCtrl"; +extern WXDLLEXPORT_DATA(const char) wxDirDialogDefaultFolderStr[] = "/"; +extern WXDLLEXPORT_DATA(const char) wxFileDialogNameStr[] = "filedlg"; #if defined(__WXMSW__) || defined(__OS2__) WXDLLEXPORT_DATA(const wxChar *) wxUserResourceStr = wxT("TEXT"); #endif - - -const wxSize wxDefaultSize(wxDefaultCoord, wxDefaultCoord); -const wxPoint wxDefaultPosition(wxDefaultCoord, wxDefaultCoord); -