Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Motif compilation fixes (now ok)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2010 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
1999-03-30 11:09:48 +00:00
parent 58230fb1b3
commit 7491d644e6
3 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/wx/motif/control.h
View File

@@ -6,7 +6,7 @@
// Created: 17/09/98 // Created: 17/09/98
// RCS-ID: $Id$ // RCS-ID: $Id$
// Copyright: (c) Julian Smart // Copyright: (c) Julian Smart
// Licence: wxWindows licence // Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
#ifndef _WX_CONTROL_H_ #ifndef _WX_CONTROL_H_
@@ -24,6 +24,7 @@
class WXDLLEXPORT wxControl: public wxWindow class WXDLLEXPORT wxControl: public wxWindow
{ {
DECLARE_ABSTRACT_CLASS(wxControl) DECLARE_ABSTRACT_CLASS(wxControl)
public: public:
wxControl(); wxControl();
~wxControl(); ~wxControl();
@@ -36,11 +37,12 @@ public:
// Places item in centre of panel - so can't be used BEFORE panel->Fit() // Places item in centre of panel - so can't be used BEFORE panel->Fit()
void Centre(int direction = wxHORIZONTAL); void Centre(int direction = wxHORIZONTAL);
inline void Callback(const wxFunction function) { m_callback = function; }; // Adds callback void Callback(const wxFunction function) { m_callback = function; }; // Adds callback
inline wxFunction GetCallback() { return m_callback; } wxFunction GetCallback() { return m_callback; }
bool InSetValue() const { return m_inSetValue; }
inline bool InSetValue() const { return m_inSetValue; }
protected: protected:
wxFunction m_callback; // Callback associated with the window wxFunction m_callback; // Callback associated with the window

11
src/motif/app.cpp
View File

@@ -49,10 +49,11 @@
extern char *wxBuffer; extern char *wxBuffer;
extern wxList wxPendingDelete; extern wxList wxPendingDelete;
#if wxUSE_THREADS #if wxUSE_THREADS
extern wxList wxPendingEvents; extern wxList wxPendingEvents;
extern wxList wxPendingEventsLocker; extern wxCriticalSection wxPendingEventsLocker;
#endif #endif // wxUSE_THREADS
wxApp *wxTheApp = NULL; wxApp *wxTheApp = NULL;
@@ -494,7 +495,7 @@ void wxApp::DeletePendingObjects()
#if wxUSE_THREADS #if wxUSE_THREADS
void wxApp::ProcessPendingEvents() void wxApp::ProcessPendingEvents()
{
wxNode *node = wxPendingEvents.First(); wxNode *node = wxPendingEvents.First();
wxCriticalSectionLocker locker(wxPendingEventsLocker); wxCriticalSectionLocker locker(wxPendingEventsLocker);
@@ -507,8 +508,8 @@ void wxApp::ProcessPendingEvents()
delete node; delete node;
node = wxPendingEvents.First(); node = wxPendingEvents.First();
} }
}
#endif #endif // wxUSE_THREADS
wxLog* wxApp::CreateLogTarget() wxLog* wxApp::CreateLogTarget()
{ {

4
src/motif/utils.cpp
View File

@@ -462,8 +462,8 @@ void wxXMergeDatabases (wxApp * theApp, Display * display)
size_t len; size_t len;
environment = GetIniFile (filename, NULL); environment = GetIniFile (filename, NULL);
len = strlen (environment); len = strlen (environment);
wxString hostname; wxString hostname = wxGetHostName();
if ( wxGetHostName(hostname) ) if ( !!hostname )
strncat(environment, hostname, 1024 - len); strncat(environment, hostname, 1024 - len);
} }
homeDB = XrmGetFileDatabase (environment); homeDB = XrmGetFileDatabase (environment);