wxFrame::CreateToolBar() stuff

wxDC::SetBackground from Chris Breeze
zillions of compile fixes


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@364 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
1998-07-24 19:05:25 +00:00
parent d602f1d8b6
commit 46dc76ba35
53 changed files with 645 additions and 376 deletions

View File

@@ -21,8 +21,6 @@
#include "wx/filefn.h"
// ----------------------------------------------------------------------------
<<<<<<< file.h
=======
// constants
// ----------------------------------------------------------------------------
@@ -47,7 +45,6 @@ const off_t ofsInvalid = (off_t)-1;
#define wxS_DEFAULT (wxS_IRUSR | wxS_IWUSR | wxS_IRGRP | wxS_IROTH)
// ----------------------------------------------------------------------------
>>>>>>> 1.7
// class wxFile: raw file IO
//
// NB: for space efficiency this class has no virtual functions, including
@@ -78,11 +75,6 @@ public:
wxFile(int fd) { m_fd = fd; }
// open/close
<<<<<<< file.h
bool Create(const char *szFileName, bool bOverwrite = FALSE);
bool Open(const char *szFileName, OpenMode mode = read);
inline bool Close(); // Close is a NOP if not opened
=======
// create a new file (with the default value of bOverwrite, it will fail if
// the file already exists, otherwise it will overwrite it and succeed)
bool Create(const char *szFileName, bool bOverwrite = FALSE,
@@ -90,7 +82,6 @@ public:
bool Open(const char *szFileName, OpenMode mode = read,
int access = wxS_DEFAULT);
bool Close(); // Close is a NOP if not opened
>>>>>>> 1.7
// assign an existing file descriptor and get it back from wxFile object
void Attach(int fd) { Close(); m_fd = fd; }