Added some makefiles, fixed a BC++ problem in controls.cpp; changed some class

ordering for VC++ 1.5


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4404 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
1999-11-06 17:12:10 +00:00
parent 78f071b6cc
commit 0e528b997e
28 changed files with 344 additions and 88 deletions

View File

@@ -613,6 +613,7 @@ public:
*ypos = m_y;
}
#ifndef __WIN16__
void GetPosition(long *xpos, long *ypos) const
{
if (xpos)
@@ -620,6 +621,7 @@ public:
if (ypos)
*ypos = (long)m_y;
}
#endif
// Find the position of the event
wxPoint GetPosition() const { return wxPoint(m_x, m_y); }
@@ -694,11 +696,13 @@ public:
if (ypos) *ypos = m_y;
}
#ifndef __WIN16__
void GetPosition(long *xpos, long *ypos) const
{
if (xpos) *xpos = (long)m_x;
if (ypos) *ypos = (long)m_y;
}
#endif
wxPoint GetPosition() const
{ return wxPoint(m_x, m_y); }

View File

@@ -57,9 +57,6 @@ public:
// menu construction
// -----------------
// append a separator to the menu
void AppendSeparator() { Append(wxID_SEPARATOR, wxEmptyString); }
// append a normal item to the menu
void Append(int id,
const wxString& text,
@@ -69,6 +66,9 @@ public:
DoAppend(wxMenuItem::New((wxMenu *)this, id, text, help, isCheckable));
}
// append a separator to the menu
void AppendSeparator() { Append(wxID_SEPARATOR, wxEmptyString); }
// append a submenu
void Append(int id,
const wxString& text,

View File

@@ -215,7 +215,11 @@ extern LONG APIENTRY _EXPORT
// ---------------------------------------------------------------------------
// a wrapper macro for ZeroMemory()
#ifdef __WIN32__
#define wxZeroMemory(obj) ::ZeroMemory(&obj, sizeof(obj))
#else
#define wxZeroMemory(obj) memset((void*) & obj, 0, sizeof(obj))
#endif
// make conversion from wxColour and COLORREF a bit less painful
inline COLORREF wxColourToRGB(const wxColour& c)

View File

@@ -420,6 +420,12 @@
#undef wxUSE_TOOLTIPS
#define wxUSE_TOOLTIPS 0
#undef wxUSE_SPINCTRL
#define wxUSE_SPINCTRL 0
#undef wxUSE_SPINBTN
#define wxUSE_SPINBTN 0
#undef wxUSE_LIBPNG
#define wxUSE_LIBPNG 0