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

Various fixes.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1047 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
1998-11-25 12:01:23 +00:00
parent 35c9d9582b
commit 6164d85e89
12 changed files with 68 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/wx/confbase.h
View File

@@ -208,15 +208,7 @@ public:
void SetRecordDefaults(bool bDoIt = TRUE) { m_bRecordDefaults = bDoIt; }
bool IsRecordingDefaults() const { return m_bRecordDefaults; }
// does expansion only if needed
wxString ExpandEnvVars(const wxString& str) const
{
wxString tmp; // Required for BC++
if (IsExpandingEnvVars())
tmp = wxExpandEnvVars(str);
else
tmp = str;
return tmp;
}
wxString ExpandEnvVars(const wxString& str) const;
// misc accessors
inline wxString GetAppName() const { return m_appName; }

23
include/wx/list.h
View File

@@ -106,23 +106,10 @@ public:
long GetNumber() const
{ wxASSERT( m_keyType == wxKEY_INTEGER ); return m_key.integer; }
// comparaison
bool operator==(wxListKeyValue value) const
{
switch ( m_keyType )
{
default:
wxFAIL_MSG("bad key type.");
// let compiler optimize the line above away in release build
// by not putting return here...
case wxKEY_STRING:
return strcmp(m_key.string, value.string) == 0;
case wxKEY_INTEGER:
return m_key.integer == value.integer;
}
}
// comparison
// Note: implementation moved to list.cpp to prevent BC++ inline
// expansion warning.
bool operator==(wxListKeyValue value) const ;
// dtor
~wxListKey()
@@ -267,7 +254,7 @@ protected:
// this function allows the sorting of arbitrary lists by giving
// a function to compare two list elements. The list is sorted in place.
void Sort(wxSortCompareFunction compfunc);
void Sort(const wxSortCompareFunction compfunc);
// functions for iterating over the list
void *FirstThat(wxListIterateFunction func);

14
include/wx/msw/setup.h
View File

@@ -78,16 +78,10 @@
#define wxUSE_SCROLLBAR 1
// Define 1 to compile contributed wxScrollBar class
#define wxUSE_XPM_IN_X 1
#define wxUSE_XPM_IN_MSW 1
#define wxUSE_XPM_IN_MSW 0
// Define 1 to support the XPM package in wxBitmap,
// separated by platform. If 1, you must link in
// the XPM library to your applications.
#define wxUSE_IMAGE_LOADING_IN_X 1
// Use dynamic icon/bitmap loading/saving code in utils/image under X.
// If this is 1, you will need to link your applications
// with image_X.lib. where X is motif, ol, or hp.
#define wxUSE_IMAGE_LOADING_IN_MSW 1
// Use dynamic DIB loading/saving code in utils/dib under MSW.
#define wxUSE_RESOURCE_LOADING_IN_MSW 1
@@ -96,12 +90,6 @@
#define wxUSE_WX_RESOURCES 1
// Use .wxr resource mechanism (requires PrologIO library)
#define wxUSE_GNU_WXSTRING 0
// Define 1 to use modified GNU wxString class
// from (stefan.hammes@urz.uni-heidelberg.de) in contrib\string
// TODO: why does this give an unresolved 'wxRegex::Search'
// symbol if 1?
#define HAVE_SOCKET 1
// Use WinSock if 1
#define wxUSE_DOC_VIEW_ARCHITECTURE 1

2
include/wx/msw/taskbar.h
View File

@@ -61,7 +61,7 @@ protected:
static bool sm_registeredClass;
static unsigned int sm_taskbarMsg;
DECLARE_EVENT_TABLE();
DECLARE_EVENT_TABLE()
};

15
include/wx/textfile.h
View File

@@ -108,19 +108,8 @@ public:
bool Write(Type typeNew = Type_None);
// get the file termination string
inline static const char *GetEOL(Type type = typeDefault)
{
switch ( type ) {
case Type_None: return "";
case Type_Unix: return "\n";
case Type_Dos: return "\r\n";
case Type_Mac: return "\r";
default:
wxFAIL_MSG("bad file type in wxTextFile::GetEOL.");
return (const char *) NULL;
}
}
// Note: implementation moved to textfile to prevent warning due to switch.
static const char *GetEOL(Type type = typeDefault);
// dtor
~wxTextFile();

10
src/common/config.cpp
View File

@@ -210,6 +210,16 @@ bool wxConfigBase::Write(const wxString& key, bool value)
return Write(key, l);
}
wxString wxConfigBase::ExpandEnvVars(const wxString& str) const
{
wxString tmp; // Required for BC++
if (IsExpandingEnvVars())
tmp = wxExpandEnvVars(str);
else
tmp = str;
return tmp;
}
// ----------------------------------------------------------------------------
// wxConfigPathChanger

17
src/common/list.cpp
View File

@@ -440,6 +440,23 @@ void wxListBase::Sort(const wxSortCompareFunction compfunc)
delete[] objArray;
}
bool wxListKey::operator==(wxListKeyValue value) const
{
switch ( m_keyType )
{
default:
wxFAIL_MSG("bad key type.");
// let compiler optimize the line above away in release build
// by not putting return here...
case wxKEY_STRING:
return strcmp(m_key.string, value.string) == 0;
case wxKEY_INTEGER:
return m_key.integer == value.integer;
}
}
// -----------------------------------------------------------------------------
// wxList (a.k.a. wxObjectList)
// -----------------------------------------------------------------------------

10
src/common/string.cpp
View File

@@ -923,6 +923,15 @@ int wxString::Printf(const char *pszFormat, ...)
int wxString::PrintfV(const char* pszFormat, va_list argptr)
{
#ifdef __BORLANDC__
static char s_szScratch[1024];
int iLen = vsprintf(s_szScratch, pszFormat, argptr);
AllocBeforeWrite(iLen);
strcpy(m_pchData, s_szScratch);
return iLen;
#else
#ifdef __WXMSW__
#ifdef _MSC_VER
#define wxVsprintf _vsnprintf
@@ -972,6 +981,7 @@ int wxString::PrintfV(const char* pszFormat, va_list argptr)
free(buffer);
return iLen;
#endif
}
// ----------------------------------------------------------------------------

15
src/common/textfile.cpp
View File

@@ -232,3 +232,18 @@ bool wxTextFile::Write(Type typeNew)
// replace the old file with this one
return fileTmp.Commit();
}
const char *wxTextFile::GetEOL(Type type)
{
switch ( type ) {
case Type_None: return "";
case Type_Unix: return "\n";
case Type_Dos: return "\r\n";
case Type_Mac: return "\r";
default:
wxFAIL_MSG("bad file type in wxTextFile::GetEOL.");
return (const char *) NULL;
}
}

5
src/msw/makefile.b32
View File

@@ -79,8 +79,6 @@ GENERICOBJS= \
$(MSWDIR)\laywin.obj \
$(MSWDIR)\msgdlgg.obj \
$(MSWDIR)\panelg.obj \
$(MSWDIR)\printps.obj \
$(MSWDIR)\prntdlgg.obj \
$(MSWDIR)\sashwin.obj \
$(MSWDIR)\scrolwin.obj \
$(MSWDIR)\splitter.obj \
@@ -88,6 +86,9 @@ GENERICOBJS= \
$(MSWDIR)\tabg.obj \
$(MSWDIR)\textdlgg.obj
# $(MSWDIR)\printps.obj \
# $(MSWDIR)\prntdlgg.obj \
COMMONOBJS = \
$(MSWDIR)\config.obj \
$(MSWDIR)\cmndata.obj \

2
src/msw/makefile.nt
View File

@@ -309,7 +309,7 @@ $(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
$(MSWDIR)/app.obj: $*.$(SRCSUFF)
cl @<<
$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
$(CPPFLAGS) /D__NO_VC_CRTDBG__ /c /Tp $*.$(SRCSUFF) /Fo$@
<<
$(MSWDIR)/bitmap.obj: $*.$(SRCSUFF)

4
utils/ogl/src/misc.cpp
View File

@@ -444,12 +444,12 @@ wxStringList *oglFormatText(wxDC& dc, const wxString& text, double width, double
{
word[j] = 0;
j = 0;
word_list.Append((wxObject *)copystring(word));
word_list.Add(word);
end_word = FALSE;
}
if (new_line)
{
word_list.Append((wxObject *)NULL);
word_list.Append(NULL);
new_line = FALSE;
}
}