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

Changed floats to doubles in wxexpr.h; added a flag in accel.h (wxACCEL_NONE for

Browse Source 
'no ctrl/alt/shift key')


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@570 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
1998-08-17 09:39:39 +00:00
parent 12ed6eb56f
commit 7a11869dde
2 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/wx/msw/accel.h
View File

@@ -29,6 +29,9 @@ class WXDLLEXPORT wxAcceleratorTable;
// Hold Shift key down // Hold Shift key down
#define wxACCEL_SHIFT 0x04 #define wxACCEL_SHIFT 0x04
// Hold no other key
#define wxACCEL_NORMAL 0x00
class WXDLLEXPORT wxAcceleratorEntry class WXDLLEXPORT wxAcceleratorEntry
{ {
public: public:

18
include/wx/wxexpr.h
View File

@@ -80,7 +80,7 @@ class WXDLLEXPORT wxExpr
long integer; long integer;
char *word; char *word;
char *string; char *string;
float real; double real;
wxExpr *first; // If is a list expr, points to the first node wxExpr *first; // If is a list expr, points to the first node
} value; } value;
@@ -91,7 +91,7 @@ class WXDLLEXPORT wxExpr
wxExpr(const wxString& functor); // Assume this is a new clause - pass functor wxExpr(const wxString& functor); // Assume this is a new clause - pass functor
wxExpr(wxExprType the_type, const wxString& word_or_string = ""); wxExpr(wxExprType the_type, const wxString& word_or_string = "");
wxExpr(long the_integer); wxExpr(long the_integer);
wxExpr(float the_real); wxExpr(double the_real);
wxExpr(wxList *the_list); wxExpr(wxList *the_list);
~wxExpr(void); ~wxExpr(void);
@@ -105,12 +105,12 @@ class WXDLLEXPORT wxExpr
else return 0; else return 0;
} }
inline float RealValue(void) const { inline double RealValue(void) const {
if (type == wxExprReal) if (type == wxExprReal)
return value.real; return value.real;
else if (type == wxExprInteger) else if (type == wxExprInteger)
return (float)value.integer; return (double)value.integer;
else return (float)0.0; else return (double)0.0;
} }
inline wxString WordValue(void) const { inline wxString WordValue(void) const {
@@ -166,7 +166,7 @@ class WXDLLEXPORT wxExpr
// This should really be called SetAttributeValue since any existing // This should really be called SetAttributeValue since any existing
// attribute-value is deleted first. // attribute-value is deleted first.
void AddAttributeValue(const wxString& attribute, long value); void AddAttributeValue(const wxString& attribute, long value);
void AddAttributeValue(const wxString& attribute, float value); void AddAttributeValue(const wxString& attribute, double value);
void AddAttributeValueWord(const wxString& attribute, const wxString& value); void AddAttributeValueWord(const wxString& attribute, const wxString& value);
void AddAttributeValueString(const wxString& attribute, const wxString& value); void AddAttributeValueString(const wxString& attribute, const wxString& value);
void AddAttributeValue(const wxString& attribute, wxList *value); void AddAttributeValue(const wxString& attribute, wxList *value);
@@ -178,6 +178,7 @@ class WXDLLEXPORT wxExpr
bool GetAttributeValue(const wxString& att, int& var) const; bool GetAttributeValue(const wxString& att, int& var) const;
bool GetAttributeValue(const wxString& att, long& var) const; bool GetAttributeValue(const wxString& att, long& var) const;
bool GetAttributeValue(const wxString& att, float& var) const; bool GetAttributeValue(const wxString& att, float& var) const;
bool GetAttributeValue(const wxString& att, double& var) const;
bool GetAttributeValue(const wxString& att, wxString& var) const; // Word OR string -> string bool GetAttributeValue(const wxString& att, wxString& var) const; // Word OR string -> string
bool GetAttributeValue(const wxString& att, wxExpr **var) const; bool GetAttributeValue(const wxString& att, wxExpr **var) const;
@@ -185,6 +186,7 @@ class WXDLLEXPORT wxExpr
inline void AssignAttributeValue(char *att, int *var) const { GetAttributeValue(att, *var); } inline void AssignAttributeValue(char *att, int *var) const { GetAttributeValue(att, *var); }
inline void AssignAttributeValue(char *att, long *var) const { GetAttributeValue(att, *var); } inline void AssignAttributeValue(char *att, long *var) const { GetAttributeValue(att, *var); }
inline void AssignAttributeValue(char *att, float *var) const { GetAttributeValue(att, *var); } inline void AssignAttributeValue(char *att, float *var) const { GetAttributeValue(att, *var); }
inline void AssignAttributeValue(char *att, double *var) const { GetAttributeValue(att, *var); }
inline void AssignAttributeValue(char *att, wxExpr **var) const { GetAttributeValue(att, var); } inline void AssignAttributeValue(char *att, wxExpr **var) const { GetAttributeValue(att, var); }
void AssignAttributeValue(char *att, char **var) const ; // Word OR string -> string void AssignAttributeValue(char *att, char **var) const ; // Word OR string -> string
@@ -234,7 +236,7 @@ class WXDLLEXPORT wxExprDatabase: public wxList
// This doesn't use hashing; it's a linear search. // This doesn't use hashing; it's a linear search.
wxExpr *FindClause(const wxString& word, const wxString& value); wxExpr *FindClause(const wxString& word, const wxString& value);
wxExpr *FindClause(const wxString& word, long value); wxExpr *FindClause(const wxString& word, long value);
wxExpr *FindClause(const wxString& word, float value); wxExpr *FindClause(const wxString& word, double value);
wxExpr *FindClauseByFunctor(const wxString& functor); wxExpr *FindClauseByFunctor(const wxString& functor);
wxExpr *HashFind(const wxString& functor, const wxString& value) const; wxExpr *HashFind(const wxString& functor, const wxString& value) const;
@@ -261,7 +263,7 @@ class WXDLLEXPORT wxExprDatabase: public wxList
wxExpr* WXDLLEXPORT wxExprMakeCall(const wxString& functor ...); wxExpr* WXDLLEXPORT wxExprMakeCall(const wxString& functor ...);
#define wxExprMakeInteger(x) (new wxExpr((long)x)) #define wxExprMakeInteger(x) (new wxExpr((long)x))
#define wxExprMakeReal(x) (new wxExpr((float)x)) #define wxExprMakeReal(x) (new wxExpr((double)x))
#define wxExprMakeString(x) (new wxExpr(wxExprString, x)) #define wxExprMakeString(x) (new wxExpr(wxExprString, x))
#define wxExprMakeWord(x) (new wxExpr(wxExprWord, x)) #define wxExprMakeWord(x) (new wxExpr(wxExprWord, x))
#define wxExprMake(x) (new wxExpr(x)) #define wxExprMake(x) (new wxExpr(x))