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

Added wxFULL_REPAINT_ON_RESIZE and sample icon to OpenGL samples

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32394 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2005-02-26 20:03:27 +00:00
parent 7257be76ea
commit 3a9929405b
4 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
samples/opengl/cube/cube.cpp
View File

@@ -30,6 +30,7 @@
#endif #endif
#include "cube.h" #include "cube.h"
#include "../../sample.xpm"
#ifndef __WXMSW__ // for wxStopWatch, see remark below #ifndef __WXMSW__ // for wxStopWatch, see remark below
#if defined(__WXMAC__) && !defined(__DARWIN__) #if defined(__WXMAC__) && !defined(__DARWIN__)
@@ -182,7 +183,7 @@ unsigned long TestGLCanvas::m_gsynct;
TestGLCanvas::TestGLCanvas(wxWindow *parent, wxWindowID id, TestGLCanvas::TestGLCanvas(wxWindow *parent, wxWindowID id,
const wxPoint& pos, const wxSize& size, long style, const wxString& name) const wxPoint& pos, const wxSize& size, long style, const wxString& name)
: wxGLCanvas(parent, (wxGLCanvas*) NULL, id, pos, size, style, name ) : wxGLCanvas(parent, (wxGLCanvas*) NULL, id, pos, size, style|wxFULL_REPAINT_ON_RESIZE , name )
{ {
m_init = false; m_init = false;
m_gllist = 0; m_gllist = 0;
@@ -193,7 +194,7 @@ TestGLCanvas::TestGLCanvas(wxWindow *parent, wxWindowID id,
TestGLCanvas::TestGLCanvas(wxWindow *parent, const TestGLCanvas &other, TestGLCanvas::TestGLCanvas(wxWindow *parent, const TestGLCanvas &other,
wxWindowID id, const wxPoint& pos, const wxSize& size, long style, wxWindowID id, const wxPoint& pos, const wxSize& size, long style,
const wxString& name ) const wxString& name )
: wxGLCanvas(parent, other.GetContext(), id, pos, size, style, name) : wxGLCanvas(parent, other.GetContext(), id, pos, size, style|wxFULL_REPAINT_ON_RESIZE , name)
{ {
m_init = false; m_init = false;
m_gllist = other.m_gllist; // share display list m_gllist = other.m_gllist; // share display list
@@ -440,6 +441,7 @@ MyFrame::MyFrame(wxWindow *parent, const wxString& title, const wxPoint& pos,
: wxFrame(parent, wxID_ANY, title, pos, size, style) : wxFrame(parent, wxID_ANY, title, pos, size, style)
{ {
m_canvas = NULL; m_canvas = NULL;
SetIcon(wxIcon(sample_xpm));
} }
// Intercept menu commands // Intercept menu commands
@@ -457,11 +459,6 @@ void MyFrame::OnExit( wxCommandEvent& WXUNUSED(event) )
MyFrame *frame = new MyFrame(NULL, str, wxDefaultPosition, MyFrame *frame = new MyFrame(NULL, str, wxDefaultPosition,
wxSize(400, 300)); wxSize(400, 300));
// Give it an icon
#ifdef __WXMSW__
frame->SetIcon(wxIcon(_T("mondrian")));
#endif
// Make a menubar // Make a menubar
wxMenu *winMenu = new wxMenu; wxMenu *winMenu = new wxMenu;

5
samples/opengl/isosurf/isosurf.cpp
View File

@@ -54,6 +54,8 @@
#include "isosurf.h" #include "isosurf.h"
#include "../../sample.xpm"
// The following part is taken largely unchanged from the original C Version // The following part is taken largely unchanged from the original C Version
GLboolean speed_test = GL_FALSE; GLboolean speed_test = GL_FALSE;
@@ -315,6 +317,7 @@ MyFrame::MyFrame(wxFrame *frame, const wxString& title, const wxPoint& pos,
: wxFrame(frame, wxID_ANY, title, pos, size, style) : wxFrame(frame, wxID_ANY, title, pos, size, style)
{ {
m_canvas = NULL; m_canvas = NULL;
SetIcon(wxIcon(sample_xpm));
} }
MyFrame::~MyFrame() MyFrame::~MyFrame()
@@ -344,7 +347,7 @@ END_EVENT_TABLE()
TestGLCanvas::TestGLCanvas(wxWindow *parent, wxWindowID id, TestGLCanvas::TestGLCanvas(wxWindow *parent, wxWindowID id,
const wxPoint& pos, const wxSize& size, long style, const wxPoint& pos, const wxSize& size, long style,
const wxString& name, int* gl_attrib) const wxString& name, int* gl_attrib)
: wxGLCanvas(parent, id, pos, size, style, name, gl_attrib) : wxGLCanvas(parent, id, pos, size, style|wxFULL_REPAINT_ON_RESIZE, name, gl_attrib)
{ {
parent->Show(true); parent->Show(true);
SetCurrent(); SetCurrent();

6
samples/opengl/penguin/penguin.cpp
View File

@@ -40,12 +40,13 @@
# include <GL/glu.h> # include <GL/glu.h>
#endif #endif
#include "../../sample.xpm"
#define VIEW_ASPECT 1.3 #define VIEW_ASPECT 1.3
// `Main program' equivalent, creating windows and returning main app frame // `Main program' equivalent, creating windows and returning main app frame
bool MyApp::OnInit() bool MyApp::OnInit()
{ {
// Create the main frame window // Create the main frame window
MyFrame *frame = new MyFrame(NULL, wxT("wxWidgets OpenGL Penguin Sample"), MyFrame *frame = new MyFrame(NULL, wxT("wxWidgets OpenGL Penguin Sample"),
wxDefaultPosition, wxDefaultSize); wxDefaultPosition, wxDefaultSize);
@@ -82,6 +83,7 @@ MyFrame::MyFrame(wxFrame *frame, const wxString& title, const wxPoint& pos,
: wxFrame(frame, wxID_ANY, title, pos, size, style) : wxFrame(frame, wxID_ANY, title, pos, size, style)
{ {
m_canvas = NULL; m_canvas = NULL;
SetIcon(wxIcon(sample_xpm));
} }
/* Intercept menu commands */ /* Intercept menu commands */
@@ -100,7 +102,7 @@ END_EVENT_TABLE()
TestGLCanvas::TestGLCanvas(wxWindow *parent, wxWindowID id, TestGLCanvas::TestGLCanvas(wxWindow *parent, wxWindowID id,
const wxPoint& pos, const wxSize& size, long style, const wxString& name) const wxPoint& pos, const wxSize& size, long style, const wxString& name)
: wxGLCanvas(parent, id, pos, size, style, name) : wxGLCanvas(parent, id, pos, size, style|wxFULL_REPAINT_ON_RESIZE, name)
{ {
block = false; block = false;
} }

4
samples/opengl/penguin/penguin.rc
View File

@@ -1,3 +1,3 @@
/* mondrian ICON "mondrian.ico" */ // #include "wx/msw/wx.rc"
#include "wx/msw/wx.rc" #include "../../sample.rc"