AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Added progdlgg.cpp to makefiles; fixed true/false in treectrl.h; made IsFree

Browse Source 
consistent (const omission)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2649 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart 1999-06-02 14:08:08 +00:00
parent efeb036598
commit e90babdf85
20 changed files with 62 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/generic/treectrl.h
View File

@ -405,7 +405,7 @@ public:
void Unselect();
void UnselectAll();
// select this item
void SelectItem(const wxTreeItemId& item, bool unselect_others=true, bool extended_select=false);
void SelectItem(const wxTreeItemId& item, bool unselect_others=TRUE, bool extended_select=FALSE);
// make sure this item is visible (expanding the parent item and/or
// scrolling to this item if necessary)
void EnsureVisible(const wxTreeItemId& item);

2
include/wx/log.h
View File

@ -449,7 +449,7 @@ DECLARE_LOG_FUNCTION2(SysError, long lErrCode);
#define __TFILE__ __XFILE__(__FILE__)
#endif
#if __WXDEBUG__
#ifdef __WXDEBUG__
// make life easier for people using VC++ IDE: clicking on the message
// will take us immediately to the place of the failed API
#ifdef __VISUALC__

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

@ -70,7 +70,7 @@ public:
bool RealizeResource(void);
WXHANDLE GetResourceHandle(void) ;
bool FreeResource(bool force = FALSE);
bool IsFree(void);
bool IsFree() const;
void Unshare();
};

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

@ -68,7 +68,7 @@ public:
virtual bool ReleaseResource(void);
*/
virtual bool IsFree(void);
virtual bool IsFree() const;
virtual bool Ok(void) const { return (m_refData != NULL) ; }
inline int GetPointSize(void) const { return M_FONTDATA->m_pointSize; }

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

@ -48,7 +48,7 @@ DECLARE_DYNAMIC_CLASS(wxGDIObject)
// Frees the resource
virtual bool FreeResource(bool WXUNUSED(force) = FALSE) { return FALSE; };
virtual bool IsFree(void) { return FALSE; };
virtual bool IsFree(void) const { return FALSE; };
inline bool IsNull(void) const { return (m_refData == 0); }

17
include/wx/msw/winundef.h
View File

@ -20,6 +20,7 @@
#undef GetCharWidth
#endif
#ifndef __WIN16__
inline BOOL GetCharWidth(HDC dc, UINT first, UINT last, LPINT buffer)
{
#ifdef _UNICODE
@ -28,6 +29,7 @@ inline BOOL GetCharWidth(HDC dc, UINT first, UINT last, LPINT buffer)
return GetCharWidthA(dc, first, last, buffer);
#endif
}
#endif
// FindWindow
@ -35,6 +37,7 @@ inline BOOL GetCharWidth(HDC dc, UINT first, UINT last, LPINT buffer)
#undef FindWindow
#endif
#ifndef __WIN16__
#ifdef _UNICODE
inline HWND FindWindow(LPCWSTR classname, LPCWSTR windowname)
{
@ -46,6 +49,7 @@ inline HWND FindWindow(LPCSTR classname, LPCSTR windowname)
return FindWindowA(classname, windowname);
}
#endif
#endif
// GetClassName
@ -53,6 +57,7 @@ inline HWND FindWindow(LPCSTR classname, LPCSTR windowname)
#undef GetClassName
#endif
#ifndef __WIN16__
#ifdef _UNICODE
inline int GetClassName(HWND h, LPWSTR classname, int maxcount)
{
@ -64,6 +69,7 @@ inline int GetClassName(HWND h, LPSTR classname, int maxcount)
return GetClassNameA(h, classname, maxcount);
}
#endif
#endif
// GetClassInfo
@ -71,6 +77,7 @@ inline int GetClassName(HWND h, LPSTR classname, int maxcount)
#undef GetClassInfo
#endif
#ifndef __WIN16__
#ifdef _UNICODE
inline BOOL GetClassInfo(HINSTANCE h, LPCWSTR name, LPWNDCLASSW winclass)
{
@ -82,6 +89,7 @@ inline BOOL GetClassInfo(HINSTANCE h, LPCSTR name, LPWNDCLASSA winclass)
return GetClassInfoA(h, name, winclass);
}
#endif
#endif
// LoadAccelerators
@ -89,6 +97,7 @@ inline BOOL GetClassInfo(HINSTANCE h, LPCSTR name, LPWNDCLASSA winclass)
#undef LoadAccelerators
#endif
#ifndef __WIN16__
#ifdef _UNICODE
inline HACCEL LoadAccelerators(HINSTANCE h, LPCWSTR name)
{
@ -100,7 +109,7 @@ inline HACCEL LoadAccelerators(HINSTANCE h, LPCSTR name)
return LoadAcceleratorsA(h, name);
}
#endif
#endif
// GetWindowProc... this isn't a Windows API function?!?!
//ifdef GetWindowProc
@ -114,6 +123,7 @@ inline HACCEL LoadAccelerators(HINSTANCE h, LPCSTR name)
#undef DrawText
#endif
#ifndef __WIN16__
#ifdef _UNICODE
inline int DrawText(HDC h, LPCWSTR str, int count, LPRECT rect, UINT format)
{
@ -125,6 +135,7 @@ inline int DrawText(HDC h, LPCSTR str, int count, LPRECT rect, UINT format)
return DrawTextA(h, str, count, rect, format);
}
#endif
#endif
// StartDoc
@ -132,6 +143,7 @@ inline int DrawText(HDC h, LPCSTR str, int count, LPRECT rect, UINT format)
#undef StartDoc
#endif
#ifndef __WIN16__
#ifdef _UNICODE
inline int StartDoc(HDC h, CONST DOCINFOW* info)
{
@ -143,6 +155,7 @@ inline int StartDoc(HDC h, CONST DOCINFOA* info)
return StartDocA(h, info);
}
#endif
#endif
// GetFirstChild... not a Windows API Function!?!?!
//ifdef GetFirstChild
@ -163,6 +176,7 @@ inline int StartDoc(HDC h, CONST DOCINFOA* info)
#undef GetObject
#endif
#ifndef __WIN16__
inline int GetObject(HGDIOBJ h, int i, LPVOID buffer)
{
#ifdef _UNICODE
@ -171,5 +185,6 @@ inline int GetObject(HGDIOBJ h, int i, LPVOID buffer)
return GetObjectA(h, i, buffer);
#endif
}
#endif
#endif // _WX_WINUNDEF_H_

2
include/wx/string.h
View File

@ -575,7 +575,7 @@ public:
// case-sensitive comparison (returns a value < 0, = 0 or > 0)
int Cmp(const wxChar *psz) const { return wxStrcmp(c_str(), psz); }
// same as Cmp() but not case-sensitive
int CmpNoCase(const wxChar *psz) const { return wxStricmp(c_str(), psz); }
int CmpNoCase(const wxChar *psz) const { return Stricmp(c_str(), psz); }
// test for the string equality, either considering case or not
// (if compareWithCase then the case matters)
bool IsSameAs(const wxChar *psz, bool compareWithCase = TRUE) const

3
samples/dde/client.cpp
View File

@ -79,8 +79,7 @@ bool MyApp::OnInit()
frame->Fit();
wxString server = "4242";
wxString hostName;
wxGetHostName(hostName);
wxString hostName = wxGetHostName();
if (argc > 1)
server = argv[1];

12
samples/makefile.vc
View File

@ -91,6 +91,12 @@ all:
cd $(WXDIR)\samples\dde
nmake -f client.vc FINAL=$(FINAL)
nmake -f server.vc FINAL=$(FINAL)
cd $(WXDIR)\samples\caret
nmake -f makefile.vc FINAL=$(FINAL)
cd $(WXDIR)\samples\drawing
nmake -f makefile.vc FINAL=$(FINAL)
cd $(WXDIR)\samples\scroll
nmake -f makefile.vc FINAL=$(FINAL)
# cd $(WXDIR)\samples\regtest
# nmake -f makefile.vc FINAL=$(FINAL)
@ -162,5 +168,11 @@ clean:
cd $(WXDIR)\samples\dde
nmake -f client.vc clean
nmake -f server.vc clean
cd $(WXDIR)\samples\caret
nmake -f makefile.vc clean
cd $(WXDIR)\samples\drawing
nmake -f makefile.vc clean
cd $(WXDIR)\samples\scroll
nmake -f makefile.vc clean
cd $(WXDIR)\samples

2
src/msw/brush.cpp
View File

@ -179,7 +179,7 @@ bool wxBrush::FreeResource(bool WXUNUSED(force))
else return FALSE;
}
bool wxBrush::IsFree(void)
bool wxBrush::IsFree() const
{
return (M_BRUSHDATA && (M_BRUSHDATA->m_hBrush == 0));
}

2
src/msw/font.cpp
View File

@ -232,7 +232,7 @@ WXHANDLE wxFont::GetResourceHandle()
return (WXHANDLE)M_FONTDATA->m_hFont ;
}
bool wxFont::IsFree()
bool wxFont::IsFree() const
{
return (M_FONTDATA && (M_FONTDATA->m_hFont == 0));
}

4
src/msw/makefile.b32
View File

@ -76,6 +76,7 @@ GENERICOBJS= \
$(MSWDIR)\gridg.obj \
$(MSWDIR)\laywin.obj \
$(MSWDIR)\panelg.obj \
$(MSWDIR)\progdlgg.obj \
$(MSWDIR)\prop.obj \
$(MSWDIR)\proplist.obj \
$(MSWDIR)\propform.obj \
@ -642,6 +643,8 @@ $(MSWDIR)\msgdlgg.obj: $(GENDIR)\msgdlgg.$(SRCSUFF)
$(MSWDIR)\panelg.obj: $(GENDIR)\panelg.$(SRCSUFF)
$(MSWDIR)\progdlgg.obj: $(GENDIR)\progdlgg.$(SRCSUFF)
$(MSWDIR)\prop.obj: $(GENDIR)\prop.$(SRCSUFF)
$(MSWDIR)\proplist.obj: $(GENDIR)\proplist.$(SRCSUFF)
@ -728,6 +731,7 @@ $(CFG): makefile.b32
-X
-w-par
-w-aus
-w-hid # virtual function A hides virtual function B
-WE
-tWM

3
src/msw/makefile.bcc
View File

@ -79,6 +79,7 @@ GENERICOBJS= \
$(MSWDIR)\listctrl.obj \
$(MSWDIR)\notebook.obj \
$(MSWDIR)\panelg.obj \
$(MSWDIR)\progdlgg.obj \
$(MSWDIR)\prop.obj \
$(MSWDIR)\propform.obj \
$(MSWDIR)\proplist.obj \
@ -619,6 +620,8 @@ $(MSWDIR)\printps.obj: $(GENDIR)\printps.$(SRCSUFF)
$(MSWDIR)\prntdlgg.obj: $(GENDIR)\prntdlgg.$(SRCSUFF)
$(MSWDIR)\progdlgg.obj: $(GENDIR)\progdlgg.$(SRCSUFF)
$(MSWDIR)\prop.obj: $(GENDIR)\prop.$(SRCSUFF)
$(MSWDIR)\proplist.obj: $(GENDIR)\proplist.$(SRCSUFF)

6
src/msw/makefile.dos
View File

@ -62,6 +62,7 @@ GENERICOBJS= \
$(GENDIR)\listctrl.obj \
$(GENDIR)\notebook.obj \
$(GENDIR)\panelg.obj \
$(GENDIR)\progdlgg.obj \
$(GENDIR)\prop.obj \
$(GENDIR)\propform.obj \
$(GENDIR)\proplist.obj \
@ -1031,6 +1032,11 @@ $(GENDIR)/prntdlgg.obj: $*.$(SRCSUFF)
$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
<<
$(GENDIR)/progdlgg.obj: $*.$(SRCSUFF)
cl @<<
$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
<<
$(GENDIR)/prop.obj: $*.$(SRCSUFF)
cl @<<
$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)

1
src/msw/makefile.g95
View File

@ -59,6 +59,7 @@ GENERICOBJS= \
$(GENDIR)/gridg.$(OBJSUFF) \
$(GENDIR)/laywin.$(OBJSUFF) \
$(GENDIR)/panelg.$(OBJSUFF) \
$(GENDIR)/progdlgg.$(OBJSUFF) \
$(GENDIR)/prop.$(OBJSUFF) \
$(GENDIR)/propform.$(OBJSUFF) \
$(GENDIR)/proplist.$(OBJSUFF) \

1
src/msw/makefile.sc
View File

@ -26,6 +26,7 @@ GENERICOBJS= \
$(GENDIR)\gridg.obj \
$(GENDIR)\laywin.obj \
$(GENDIR)\panelg.obj \
$(GENDIR)\progdlgg.obj \
$(GENDIR)\prop.obj \
$(GENDIR)\propform.obj \
$(GENDIR)\proplist.obj \

4
src/msw/makefile.sl
View File

@ -22,6 +22,7 @@ GENERICOBJS= choicdgg.obj \
laywin.obj \
panelg.obj \
prop.obj \
progdlgg.obj \
propform.obj \
proplist.obj \
sashwin.obj \
@ -737,6 +738,9 @@ panelg.obj: $(GENDIR)\panelg.cpp
printps.obj: $(GENDIR)\printps.cpp
$(CCC) $(CPPFLAGS) $(IFLAGS) $(GENDIR)\printps.cpp /BINARY printps.obj
progdlgg.obj: $(GENDIR)\progdlgg.cpp
$(CCC) $(CPPFLAGS) $(IFLAGS) $(GENDIR)\progdlgg.cpp /BINARY progdlgg.obj
prop.obj: $(GENDIR)\prop.cpp
$(CCC) $(CPPFLAGS) $(IFLAGS) $(GENDIR)\prop.cpp /BINARY prop.obj

1
src/msw/makefile.twn
View File

@ -61,6 +61,7 @@ GENERICOBJS= \
$(GENDIR)/gridg.$(OBJSUFF) \
$(GENDIR)/laywin.$(OBJSUFF) \
$(GENDIR)/panelg.$(OBJSUFF) \
$(GENDIR)/progdlgg.$(OBJSUFF) \
$(GENDIR)/prop.$(OBJSUFF) \
$(GENDIR)/propform.$(OBJSUFF) \
$(GENDIR)/proplist.$(OBJSUFF) \

1
src/msw/makefile.vc
View File

@ -70,6 +70,7 @@ GENERICOBJS= \
..\generic\$D\gridg.obj \
..\generic\$D\laywin.obj \
..\generic\$D\panelg.obj \
..\generic\$D\progdlgg.obj \
..\generic\$D\prop.obj \
..\generic\$D\propform.obj \
..\generic\$D\proplist.obj \

4
src/msw/makefile.wat
View File

@ -30,6 +30,7 @@ GENERICOBJS= choicdgg.obj &
gridg.obj &
laywin.obj &
panelg.obj &
progdlgg.obj &
prop.obj &
propform.obj &
proplist.obj &
@ -759,6 +760,9 @@ panelg.obj: $(GENDIR)\panelg.cpp
printps.obj: $(GENDIR)\printps.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
progdlgg.obj: $(GENDIR)\progdlgg.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
prop.obj: $(GENDIR)\prop.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<