X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e90c1d2a19361551eb07778280f22be3e759cf64..c2754d29034199bc158fc079f91c7bca15d40037:/src/gtk1/data.cpp?ds=sidebyside diff --git a/src/gtk1/data.cpp b/src/gtk1/data.cpp index 063c74c4fe..9971508a7b 100644 --- a/src/gtk1/data.cpp +++ b/src/gtk1/data.cpp @@ -7,7 +7,6 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// - #ifdef __GNUG__ // #pragma implementation #endif @@ -22,16 +21,8 @@ #define _MAXPATHLEN 500 -/* Used for X resources */ -#include -#include -#include - -wxResourceCache *wxTheResourceCache = (wxResourceCache *) NULL; -XrmDatabase wxResourceDatabase; - /* Useful buffer, initialized in wxCommonInit */ -char *wxBuffer = (char *) NULL; +wxChar *wxBuffer = (wxChar *) NULL; /* Windows List */ wxWindowList wxTopLevelWindows; @@ -39,12 +30,6 @@ wxWindowList wxTopLevelWindows; /* List of windows pending deletion */ wxList wxPendingDelete; -#if wxUSE_THREADS -/* List of events pending processing */ -wxList *wxPendingEvents = NULL; -wxCriticalSection *wxPendingEventsLocker = NULL; -#endif - /* Current cursor, in order to hang on to * cursor handle when setting the cursor globally */ wxCursor g_globalCursor; @@ -55,6 +40,9 @@ bool g_blockEventsOnDrag = FALSE; /* Don't allow mouse event propagation during scroll */ bool g_blockEventsOnScroll = FALSE; +/* Don't allow window closing if there are open dialogs */ +int g_openDialogs = 0; + /* TRUE when the message queue is empty. this gets set to FALSE by all event callbacks before anything else is done */ bool g_isIdle = FALSE; @@ -142,45 +130,47 @@ wxColour wxNullColour; wxPalette wxNullPalette; /* Default window names */ -const wxChar *wxButtonNameStr = T("button"); -const wxChar *wxCanvasNameStr = T("canvas"); -const wxChar *wxCheckBoxNameStr = T("check"); -const wxChar *wxChoiceNameStr = T("choice"); -const wxChar *wxComboBoxNameStr = T("comboBox"); -const wxChar *wxDialogNameStr = T("dialog"); -const wxChar *wxFrameNameStr = T("frame"); -const wxChar *wxGaugeNameStr = T("gauge"); -const wxChar *wxStaticBoxNameStr = T("groupBox"); -const wxChar *wxListBoxNameStr = T("listBox"); -const wxChar *wxStaticTextNameStr = T("message"); -const wxChar *wxStaticBitmapNameStr = T("message"); -const wxChar *wxMultiTextNameStr = T("multitext"); -const wxChar *wxPanelNameStr = T("panel"); -const wxChar *wxRadioBoxNameStr = T("radioBox"); -const wxChar *wxRadioButtonNameStr = T("radioButton"); -const wxChar *wxBitmapRadioButtonNameStr = T("radioButton"); -const wxChar *wxScrollBarNameStr = T("scrollBar"); -const wxChar *wxSliderNameStr = T("slider"); -const wxChar *wxStaticNameStr = T("static"); -const wxChar *wxTextCtrlWindowNameStr = T("textWindow"); -const wxChar *wxTextCtrlNameStr = T("text"); -const wxChar *wxVirtListBoxNameStr = T("virtListBox"); -const wxChar *wxButtonBarNameStr = T("buttonbar"); -const wxChar *wxEnhDialogNameStr = T("Shell"); -const wxChar *wxToolBarNameStr = T("toolbar"); -const wxChar *wxStatusLineNameStr = T("status_line"); -const wxChar *wxGetTextFromUserPromptStr = T("Input Text"); -const wxChar *wxMessageBoxCaptionStr = T("Message"); -const wxChar *wxFileSelectorPromptStr = T("Select a file"); -const wxChar *wxFileSelectorDefaultWildcardStr = T("*"); -const wxChar *wxInternalErrorStr = T("wxWindows Internal Error"); -const wxChar *wxFatalErrorStr = T("wxWindows Fatal Error"); -const wxChar *wxDirDialogNameStr = T("wxDirCtrl"); -const wxChar *wxDirDialogDefaultFolderStr = T("/"); +const wxChar *wxControlNameStr = wxT("control"); +const wxChar *wxButtonNameStr = wxT("button"); +const wxChar *wxCanvasNameStr = wxT("canvas"); +const wxChar *wxCheckBoxNameStr = wxT("check"); +const wxChar *wxChoiceNameStr = wxT("choice"); +const wxChar *wxComboBoxNameStr = wxT("comboBox"); +const wxChar *wxDialogNameStr = wxT("dialog"); +const wxChar *wxFrameNameStr = wxT("frame"); +const wxChar *wxGaugeNameStr = wxT("gauge"); +const wxChar *wxStaticBoxNameStr = wxT("groupBox"); +const wxChar *wxListBoxNameStr = wxT("listBox"); +const wxChar *wxStaticTextNameStr = wxT("message"); +const wxChar *wxStaticBitmapNameStr = wxT("message"); +const wxChar *wxMultiTextNameStr = wxT("multitext"); +const wxChar *wxPanelNameStr = wxT("panel"); +const wxChar *wxRadioBoxNameStr = wxT("radioBox"); +const wxChar *wxRadioButtonNameStr = wxT("radioButton"); +const wxChar *wxBitmapRadioButtonNameStr = wxT("radioButton"); +const wxChar *wxScrollBarNameStr = wxT("scrollBar"); +const wxChar *wxSliderNameStr = wxT("slider"); +const wxChar *wxStaticNameStr = wxT("static"); +const wxChar *wxTextCtrlWindowNameStr = wxT("textWindow"); +const wxChar *wxTextCtrlNameStr = wxT("text"); +const wxChar *wxVirtListBoxNameStr = wxT("virtListBox"); +const wxChar *wxButtonBarNameStr = wxT("buttonbar"); +const wxChar *wxEnhDialogNameStr = wxT("Shell"); +const wxChar *wxToolBarNameStr = wxT("toolbar"); +const wxChar *wxStatusLineNameStr = wxT("status_line"); +const wxChar *wxGetTextFromUserPromptStr = wxT("Input Text"); +const wxChar *wxMessageBoxCaptionStr = wxT("Message"); +const wxChar *wxFileSelectorPromptStr = wxT("Select a file"); +const wxChar *wxFileSelectorDefaultWildcardStr = wxT("*"); +const wxChar *wxInternalErrorStr = wxT("wxWindows Internal Error"); +const wxChar *wxFatalErrorStr = wxT("wxWindows Fatal Error"); +const wxChar *wxDirDialogNameStr = wxT("wxDirCtrl"); +const wxChar *wxDirDialogDefaultFolderStr = wxT("/"); +const wxChar *wxTreeCtrlNameStr = wxT("wxTreeCtrl"); /* See wx/utils.h */ -const wxChar *wxFloatToStringStr = T("%.2f"); -const wxChar *wxDoubleToStringStr = T("%.2f"); +const wxChar *wxFloatToStringStr = wxT("%.2f"); +const wxChar *wxDoubleToStringStr = wxT("%.2f"); /* Dafaults for wxWindow etc. */ const wxSize wxDefaultSize(-1, -1);