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

Added more makefiles; fixed some samples for Cygwin

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1654 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
1999-02-09 16:00:23 +00:00
parent fed485e094
commit dbda9e86f0
84 changed files with 1997 additions and 1578 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
include/wx/date.h
View File

@@ -21,6 +21,15 @@
#include "wx/string.h"
#if wxUSE_TIMEDATE
// These lines necessary to stop VC++ 6 being confused about namespaces
class WXDLLEXPORT wxDate;
bool WXDLLEXPORT operator<(const wxDate &dt1, const wxDate &dt2);
bool WXDLLEXPORT operator<(const wxDate &dt1, const wxDate &dt2);
bool WXDLLEXPORT operator <= (const wxDate &dt1, const wxDate &dt2);
bool WXDLLEXPORT operator > (const wxDate &dt1, const wxDate &dt2);
bool WXDLLEXPORT operator >= (const wxDate &dt1, const wxDate &dt2);
bool WXDLLEXPORT operator == (const wxDate &dt1, const wxDate &dt2);
bool WXDLLEXPORT operator != (const wxDate &dt1, const wxDate &dt2);
enum wxdate_format_type {wxMDY, wxDAY, wxMONTH, wxFULL, wxEUROPEAN};

7
include/wx/defs.h
View File

@@ -160,11 +160,8 @@
#elif defined(__WATCOMC__)
// typedef unsigned int bool;
#if __WATCOMC__<1100
typedef enum _tagbool {
false,
true
} bool ;
#if (__WATCOMC__ < 1100)
typedef unsigned int bool;
#endif
#elif defined(__SUNCC__)

1
include/wx/motif/window.h
View File

@@ -27,6 +27,7 @@
#include "wx/list.h"
#include "wx/region.h"
#include "wx/accel.h"
#include "wx/intl.h"
#define wxKEY_SHIFT 1
#define wxKEY_CTRL 2

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

@@ -132,7 +132,7 @@
#ifndef __MWERKS__
#define wxUSE_IOSTREAMH 1
#else
#define wxUSE_IOSTREAMH 0
#define wxUSE_IOSTREAMH 1
#endif
// VC++ 4.2 and above allows <iostream> and <iostream.h>
// but you can't mix them. Set to 1 for <iostream.h>,

8
include/wx/msw/window.h
View File

@@ -27,6 +27,7 @@
#include "wx/list.h"
#include "wx/region.h"
#include "wx/msw/accel.h"
#include "wx/intl.h"
#define wxKEY_SHIFT 1
#define wxKEY_CTRL 2
@@ -621,9 +622,10 @@ public:
virtual void MSWOnMouseEnter(int x, int y, WXUINT flags);
virtual void MSWOnMouseLeave(int x, int y, WXUINT flags);
virtual void MSWOnChar(WXWORD wParam, WXLPARAM lParam, bool isASCII = FALSE);
virtual void MSWOnKeyDown(WXWORD wParam, WXLPARAM lParam, bool isASCII = FALSE);
virtual void MSWOnKeyUp(WXWORD wParam, WXLPARAM lParam, bool isASCII = FALSE);
// These return TRUE if an event handler was found, FALSE otherwise (not processed)
virtual bool MSWOnChar(WXWORD wParam, WXLPARAM lParam, bool isASCII = FALSE);
virtual bool MSWOnKeyDown(WXWORD wParam, WXLPARAM lParam, bool isASCII = FALSE);
virtual bool MSWOnKeyUp(WXWORD wParam, WXLPARAM lParam, bool isASCII = FALSE);
virtual bool MSWOnActivate(int flag, bool minimized, WXHWND activate);
virtual long MSWOnMDIActivate(long flag, WXHWND activate, WXHWND deactivate);

10
include/wx/string.h
View File

@@ -70,7 +70,7 @@ const unsigned int wxSTRING_MAXLEN = UINT_MAX - 100;
//---------------------------------------------------------------------------
// checks whether the passed in pointer is NULL and if the string is empty
inline bool WXDLLEXPORT IsEmpty(const char *p) { return !p || !*p; }
inline bool WXDLLEXPORT IsEmpty(const char *p) { return (!p || !*p); }
// safe version of strlen() (returns 0 if passed NULL pointer)
inline size_t WXDLLEXPORT Strlen(const char *psz)
@@ -144,8 +144,8 @@ struct WXDLLEXPORT wxStringData
char* data() const { return (char*)(this + 1); }
// empty string has a special ref count so it's never deleted
bool IsEmpty() const { return nRefs == -1; }
bool IsShared() const { return nRefs > 1; }
bool IsEmpty() const { return (nRefs == -1); }
bool IsShared() const { return (nRefs > 1); }
// lock/unlock
void Lock() { if ( !IsEmpty() ) nRefs++; }
@@ -153,8 +153,8 @@ struct WXDLLEXPORT wxStringData
// if we had taken control over string memory (GetWriteBuf), it's
// intentionally put in invalid state
void Validate(bool b) { nRefs = b ? 1 : 0; }
bool IsValid() const { return nRefs != 0; }
void Validate(bool b) { nRefs = (b ? 1 : 0); }
bool IsValid() const { return (nRefs != 0); }
};
// ---------------------------------------------------------------------------

1
include/wx/stubs/window.h
View File

@@ -27,6 +27,7 @@
#include "wx/list.h"
#include "wx/region.h"
#include "wx/accel.h"
#include "wx/intl.h"
#define wxKEY_SHIFT 1
#define wxKEY_CTRL 2

2
include/wx/valgen.h
View File

@@ -38,7 +38,7 @@ public:
// Called when the value in the window must be validated.
// This function can pop up an error message.
virtual bool Validate(wxWindow *parent) {return true;}
virtual bool Validate(wxWindow *parent) {return TRUE;}
// Called to transfer data to the window
virtual bool TransferToWindow(void);