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

*** empty log message ***

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3236 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Webster
1999-08-02 04:54:56 +00:00
parent 54da4255a2
commit 913df6f2e0
13 changed files with 139 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/common/fs_inet.cpp
View File

@@ -98,7 +98,12 @@ wxFSFile* wxInternetFSHandler::OpenFile(wxFileSystem& WXUNUSED(fs), const wxStri
m_Cache.Put(right, info);
{ // ok, now copy it:
#if defined(__VISAGECPP__)
// VA thinks this is an ambiguous call
wxFileOutputStream sout((wxString)buf);
#else
wxFileOutputStream sout(buf);
#endif
s -> Read(sout); // copy the stream
}
delete s;

3
src/common/gdicmn.cpp
View File

@@ -256,6 +256,9 @@ wxColour *wxColourDatabase::FindColour(const wxString& colour)
#ifdef __WXMSW__
else return NULL;
#endif
#ifdef __WXPM__
else return NULL;
#endif
// TODO for other implementations. This should really go into
// platform-specific directories.

6
src/common/intl.cpp
View File

@@ -76,7 +76,11 @@ typedef unsigned char size_t8;
public:
IntSizeChecker()
{
wxASSERT_MSG( sizeof(int) == 4,
// Asserting a sizeof directly causes some compilers to
// issue a "using constant in a conditional expression" warning
size_t intsize = sizeof(int);
wxASSERT_MSG( intsize == 4,
"size_t32 is incorrectly defined!" );
}
} intsizechecker;

2
src/common/list.cpp
View File

@@ -604,7 +604,7 @@ bool wxStringList::Member(const wxChar *s) const
return FALSE;
}
static int
static int LINKAGEMODE
wx_comparestrings(const void *arg1, const void *arg2)
{
wxChar **s1 = (wxChar **) arg1;

8
src/common/resource.cpp
View File

@@ -191,7 +191,8 @@ bool wxResourceTable::DeleteResource(const wxString& name)
// parent's child list.
BeginFind();
wxNode *node = (wxNode *) NULL;
while ((node = Next()))
node = Next();
while (node != NULL)
{
wxItemResource *parent = (wxItemResource *)node->Data();
if (parent->GetChildren().Member(item))
@@ -199,6 +200,7 @@ bool wxResourceTable::DeleteResource(const wxString& name)
parent->GetChildren().DeleteObject(item);
break;
}
node = Next();
}
delete item;
@@ -2041,7 +2043,8 @@ long wxParseWindowStyle(const wxString& bitListString)
int i = 0;
wxChar *word;
long bitList = 0;
while ((word = wxResourceParseWord(WXSTRINGCAST bitListString, &i)))
word = wxResourceParseWord(WXSTRINGCAST bitListString, &i);
while (word != NULL)
{
bool found = FALSE;
int j;
@@ -2057,6 +2060,7 @@ long wxParseWindowStyle(const wxString& bitListString)
wxLogWarning(_("Unrecognized style %s whilst parsing resource."), word);
return 0;
}
word = wxResourceParseWord(WXSTRINGCAST bitListString, &i);
}
return bitList;
}

13
src/common/string.cpp
View File

@@ -13,6 +13,12 @@
#pragma implementation "string.h"
#endif
#ifdef __WXPM__
#define LINKAGECPP _Optlink
#else
#define LINKAGECPP
#endif
/*
* About ref counting:
* 1) all empty strings use g_strEmpty, nRefs = -1 (set in Init())
@@ -1685,7 +1691,12 @@ void wxArrayString::Grow()
else {
// otherwise when it's called for the first time, nIncrement would be 0
// and the array would never be expanded
#if defined(__VISAGECPP__)
int array_size = ARRAY_DEFAULT_INITIAL_SIZE;
wxASSERT( array_size != 0 );
#else
wxASSERT( ARRAY_DEFAULT_INITIAL_SIZE != 0 );
#endif
// add 50% but not too much
size_t nIncrement = m_nSize < ARRAY_DEFAULT_INITIAL_SIZE
@@ -1880,7 +1891,7 @@ static wxArrayString::CompareFunction gs_compareFunction = NULL;
static bool gs_sortAscending = TRUE;
// function which is called by quick sort
static int wxStringCompareFunction(const void *first, const void *second)
static int LINKAGEMODE wxStringCompareFunction(const void *first, const void *second)
{
wxString *strFirst = (wxString *)first;
wxString *strSecond = (wxString *)second;

5
src/common/unzip.c
View File

@@ -128,6 +128,10 @@ typedef struct
file if we are decompressing it */
} unz_s;
#if defined (__VISAGECPP__)
// VA always requires prototypes
int unzlocal_CheckCurrentFileCoherencyHeader (unz_s*, uInt*, uLong*, uInt*);
#endif
/* ===========================================================================
Read a byte from a gz_stream; update next_in and avail_in. Return EOF
@@ -421,7 +425,6 @@ extern unzFile ZEXPORT unzOpen (path)
fclose(fin);
return NULL;
}
us.file=fin;
us.byte_before_the_zipfile = central_pos -
(us.offset_central_dir+us.size_central_dir);

10
src/common/unzip.h
View File

@@ -268,6 +268,16 @@ extern int ZEXPORT unzGetLocalExtrafield OF((unzFile file,
the error code
*/
#if defined(__VISAGECPP__)
//Visualage complains of no prototypes
int unzlocal_getByte(FILE* , int*);
int strcmpcasenosensitive_internal (const char*, const char*);
int unzlocal_getShort (FILE*, uLong*);
int unzlocal_getLong (FILE*, uLong*);
uLong unzlocal_SearchCentralDir(FILE*);
void unzlocal_DosDateToTmuDate (uLong, tm_unz*);
#endif
#ifdef __cplusplus
}
#endif

4
src/common/wincmn.cpp
View File

@@ -541,7 +541,7 @@ bool wxWindowBase::SetCursor(const wxCursor& cursor)
// don't try to set invalid cursor, always fall back to the default
const wxCursor& cursorOk = cursor.Ok() ? cursor : *wxSTANDARD_CURSOR;
if ( cursorOk == m_cursor )
if ( (wxCursor&)cursorOk == m_cursor )
{
// no change
return FALSE;
@@ -557,7 +557,7 @@ bool wxWindowBase::SetFont(const wxFont& font)
// don't try to set invalid font, always fall back to the default
const wxFont& fontOk = font.Ok() ? font : *wxSWISS_FONT;
if ( fontOk == m_font )
if ( (wxFont&)fontOk == m_font )
{
// no change
return FALSE;

17
src/generic/gridg.cpp
View File

@@ -49,6 +49,13 @@
#define wxUSE_DOUBLE_BUFFERING 1
#endif
#ifdef __WXPM__
#define wxIPE_ADJUST -1
#define wxIPE_STYLE wxNO_BORDER
#define wxIPE_HIGHLIGHT 1
#define wxUSE_DOUBLE_BUFFERING 1
#endif
#ifdef __WXGTK__
#define wxIPE_ADJUST -1
#define wxIPE_STYLE wxNO_BORDER
@@ -1518,9 +1525,17 @@ void wxGenericGrid::OnSelectCellImplementation(wxDC *dc, int row, int col)
m_inPlaceTextItem->Show(TRUE);
m_inPlaceTextItem->SetFocus();
if (wxIPE_HIGHLIGHT)
#if defined(__VISAGECPP__)
{
int highlight = wxIPE_HIGHLIGHT;
if (highlight != 0)
HighlightCell(dc, TRUE);
}
#else
if (wxIPE_HIGHLIGHT != 0)
HighlightCell(dc, TRUE);
#endif
}
else
{
// 1) Why isn't this needed for Windows??

2
src/generic/tipdlg.cpp
View File

@@ -183,7 +183,7 @@ wxTipDialog::wxTipDialog(wxWindow *parent,
wxTE_MULTILINE | wxTE_READONLY | wxSUNKEN_BORDER);
m_text->SetFont(wxFont(14, wxROMAN, wxNORMAL, wxNORMAL));
#ifdef __WXMSW__
#if defined(__WXMSW__) || defined(__WXPM__)
wxIcon icon("wxICON_TIP");
#else
#include "wx/generic/tip.xpm"

75
src/os2/makefile.va
View File

@@ -57,11 +57,13 @@ $(CPPFLAGS) /Fo$@ /Tp $<
<<
{..\os2}.cpp{..\os2\$D}.obj:
@echo $<
icc @<<
$(CPPFLAGS) /Fo$@ /Tp $<
<<
{..\html}.cpp{..\html\$D}.obj:
@echo $<
icc @<<
$(CPPFLAGS) /Fo$@ /Tp $<
<<
@@ -181,80 +183,7 @@ COMMONOBJS = \
OS2OBJS = \
..\os2\$D\accel.obj \
..\os2\$D\app.obj \
..\os2\$D\bitmap.obj \
..\os2\$D\bmpbuttn.obj \
..\os2\$D\brush.obj \
..\os2\$D\button.obj \
..\os2\$D\checkbox.obj \
..\os2\$D\checklst.obj \
..\os2\$D\choice.obj \
..\os2\$D\clipbrd.obj \
..\os2\$D\dcprint.obj \
..\os2\$D\dcscreen.obj \
..\os2\$D\dde.obj \
..\os2\$D\dialog.obj \
..\os2\$D\dib.obj \
..\os2\$D\dibutils.obj \
..\os2\$D\dirdlg.obj \
..\os2\$D\filedlg.obj \
..\os2\$D\font.obj \
..\os2\$D\fontdlg.obj \
..\os2\$D\frame.obj \
..\os2\$D\gauge.obj \
..\os2\$D\gdiobj.obj \
..\os2\$D\helpwin.obj \
..\os2\$D\icon.obj \
..\os2\$D\iniconf.obj \
..\os2\$D\joystick.obj \
..\os2\$D\imaglist.obj \
..\os2\$D\listbox.obj \
..\os2\$D\listctrl.obj \
..\os2\$D\main.obj \
..\os2\$D\mdi.obj \
..\os2\$D\menu.obj \
..\os2\$D\menuitem.obj \
..\os2\$D\metafile.obj \
..\os2\$D\minifram.obj \
..\os2\$D\msgdlg.obj \
..\os2\$D\nativdlg.obj \
..\os2\$D\notebook.obj \
..\os2\$D\ownerdrw.obj \
..\os2\$D\palette.obj \
..\os2\$D\pen.obj \
..\os2\$D\penwin.obj \
..\os2\$D\pnghand.obj \
..\os2\$D\printdlg.obj \
..\os2\$D\printwin.obj \
..\os2\$D\radiobox.obj \
..\os2\$D\radiobut.obj \
..\os2\$D\region.obj \
..\os2\$D\registry.obj \
..\os2\$D\regconf.obj \
..\os2\$D\scrolbar.obj \
..\os2\$D\settings.obj \
..\os2\$D\slidrmsw.obj \
..\os2\$D\slider95.obj \
..\os2\$D\spinbutt.obj \
..\os2\$D\statbmp.obj \
..\os2\$D\statbox.obj \
..\os2\$D\statusbr.obj \
..\os2\$D\stattext.obj \
..\os2\$D\tabctrl.obj \
..\os2\$D\taskbar.obj \
..\os2\$D\tbarmsw.obj \
..\os2\$D\textctrl.obj \
..\os2\$D\thread.obj \
..\os2\$D\timer.obj \
..\os2\$D\toolbar.obj \
..\os2\$D\tooltip.obj \
..\os2\$D\treectrl.obj \
..\os2\$D\utils.obj \
..\os2\$D\utilsexc.obj \
..\os2\$D\wave.obj \
..\os2\$D\window.obj \
..\os2\$D\xpmhand.obj \
HTMLOBJS = \
..\html\$D\htmlcell.obj \