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

Copy helpview XPMs

Browse Source 
char -> wxChar in glcanvas


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@17989 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2002-11-28 11:27:33 +00:00
parent ece34aec85
commit b7f3131ac8
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.in
View File

@@ -1372,6 +1372,7 @@ UTILS_DIST: ALL_GUI_DIST
cp $(UTILSDIR)/helpview/src/*.cpp $(DISTDIR)/utils/helpview/src cp $(UTILSDIR)/helpview/src/*.cpp $(DISTDIR)/utils/helpview/src
cp $(UTILSDIR)/helpview/src/Makefile.in $(DISTDIR)/utils/helpview/src cp $(UTILSDIR)/helpview/src/Makefile.in $(DISTDIR)/utils/helpview/src
cp $(UTILSDIR)/helpview/src/test.zip $(DISTDIR)/utils/helpview/src cp $(UTILSDIR)/helpview/src/test.zip $(DISTDIR)/utils/helpview/src
cp $(UTILSDIR)/helpview/src/bitmaps/*.xpm $(DISTDIR)/utils/helpview/src/bitmaps
MISC_DIST: ALL_GUI_DIST MISC_DIST: ALL_GUI_DIST
mkdir $(DISTDIR)/misc mkdir $(DISTDIR)/misc

4
include/wx/msw/glcanvas.h
View File

@@ -66,7 +66,7 @@ public:
~wxGLContext(); ~wxGLContext();
void SetCurrent(); void SetCurrent();
void SetColour(const char *colour); void SetColour(const wxChar *colour);
void SwapBuffers(); void SwapBuffers();
@@ -106,7 +106,7 @@ class WXDLLEXPORT wxGLCanvas: public wxWindow
const wxPoint& pos, const wxSize& size, long style, const wxString& name); const wxPoint& pos, const wxSize& size, long style, const wxString& name);
void SetCurrent(); void SetCurrent();
void SetColour(const char *colour); void SetColour(const wxChar *colour);
void SwapBuffers(); void SwapBuffers();
void OnSize(wxSizeEvent& event); void OnSize(wxSizeEvent& event);

4
src/msw/glcanvas.cpp
View File

@@ -104,7 +104,7 @@ void wxGLContext::SetCurrent()
*/ */
} }
void wxGLContext::SetColour(const char *colour) void wxGLContext::SetColour(const wxChar *colour)
{ {
float r = 0.0; float r = 0.0;
float g = 0.0; float g = 0.0;
@@ -522,7 +522,7 @@ void wxGLCanvas::SetCurrent()
} }
} }
void wxGLCanvas::SetColour(const char *colour) void wxGLCanvas::SetColour(const wxChar *colour)
{ {
if (m_glContext) if (m_glContext)
m_glContext->SetColour(colour); m_glContext->SetColour(colour);