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

wxFrame::CreateToolBar() stuff

Browse Source 
wxDC::SetBackground from Chris Breeze
zillions of compile fixes


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@364 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
1998-07-24 19:05:25 +00:00
parent d602f1d8b6
commit 46dc76ba35
53 changed files with 645 additions and 376 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
samples/mdi/mdi.cpp
View File

@@ -21,17 +21,10 @@
#include "wx/mdi.h"
#endif
#ifdef __WXMSW__
#ifdef __WIN95__
#include <wx/tbar95.h>
#else
#include <wx/tbarmsw.h>
#endif
#endif
#include <wx/toolbar.h>
#ifdef __WXGTK__
//#include "list.xpm"
//#include "folder.xpm"
#include "folder.xpm"
#endif
#include "mdi.h"
@@ -105,10 +98,8 @@ MyFrame::MyFrame(wxWindow *parent, const wxWindowID id, const wxString& title, c
wxTE_MULTILINE|wxSUNKEN_BORDER);
textWindow->SetValue("A help window");
#ifdef __WXMSW__
toolBar = new TestRibbon(this, 0, 0, 100, 30, wxNO_BORDER, wxVERTICAL, 1);
SetToolBar(toolBar);
#endif
}
void MyFrame::OnQuit(wxCommandEvent& event)
@@ -257,14 +248,12 @@ void MyFrame::OnSize(wxSizeEvent& event)
int tw = 0;
int th = 0;
#ifdef __WXMSW__
wxWindow* tbar = GetToolBar();
if (tbar)
{
tbar->GetSize(&tw, &th);
tbar->SetSize(w, th);
}
#endif
textWindow->SetSize(0, th, 200, h-th);
GetClientWindow()->SetSize(200, th, w - 200, h-th);
@@ -316,8 +305,6 @@ bool MyChild::OnClose(void)
return TRUE;
}
#ifdef __WXMSW__
BEGIN_EVENT_TABLE(TestRibbon, wxToolBar)
EVT_PAINT(TestRibbon::OnPaint)
END_EVENT_TABLE()
@@ -328,6 +315,7 @@ TestRibbon::TestRibbon(wxFrame *frame, int x, int y, int w, int h,
{
wxBitmap* bitmaps[8];
#ifdef __WXMSW__
bitmaps[0] = new wxBitmap("icon1", wxBITMAP_TYPE_RESOURCE);
bitmaps[1] = new wxBitmap("icon2", wxBITMAP_TYPE_RESOURCE);
bitmaps[2] = new wxBitmap("icon3", wxBITMAP_TYPE_RESOURCE);
@@ -336,6 +324,16 @@ TestRibbon::TestRibbon(wxFrame *frame, int x, int y, int w, int h,
bitmaps[5] = new wxBitmap("icon6", wxBITMAP_TYPE_RESOURCE);
bitmaps[6] = new wxBitmap("icon7", wxBITMAP_TYPE_RESOURCE);
bitmaps[7] = new wxBitmap("icon8", wxBITMAP_TYPE_RESOURCE);
#else
bitmaps[0] = new wxBitmap( folder_xpm );
bitmaps[1] = new wxBitmap( folder_xpm );
bitmaps[2] = new wxBitmap( folder_xpm );
bitmaps[3] = new wxBitmap( folder_xpm );
bitmaps[4] = new wxBitmap( folder_xpm );
bitmaps[5] = new wxBitmap( folder_xpm );
bitmaps[6] = new wxBitmap( folder_xpm );
bitmaps[7] = new wxBitmap( folder_xpm );
#endif
#ifdef __WXMSW__
int width = 24;
@@ -403,4 +401,3 @@ void TestRibbon::OnPaint(wxPaintEvent& event)
dc.DrawLine(0, h-1, w, h-1);
}
#endif

6
samples/mdi/mdi.h
View File

@@ -34,8 +34,6 @@ class MyCanvas: public wxScrolledWindow
DECLARE_EVENT_TABLE()
};
#ifdef __WXMSW__
class TestRibbon: public wxToolBar
{
public:
@@ -48,17 +46,13 @@ class TestRibbon: public wxToolBar
DECLARE_EVENT_TABLE()
};
#endif
// Define a new frame
class MyFrame: public wxMDIParentFrame
{
public:
wxTextCtrl *textWindow;
#ifdef __WXMSW__
TestRibbon* toolBar;
#endif
MyFrame(wxWindow *parent, const wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, const long style);
bool OnClose(void);

10
samples/memcheck/memcheck.cpp
View File

@@ -31,7 +31,7 @@
#error You must set WXDEBUG to 1 on the 'make' command line or make.env.
#endif
#define new WXDEBUG_NEW
// #define new WXDEBUG_NEW
// Define a new application type
class MyApp: public wxApp
@@ -81,7 +81,7 @@ bool MyApp::OnInit(void)
frame->Show(TRUE);
// wxDebugContext::SetCheckpoint();
wxDebugContext::SetFile("debug.log");
// wxDebugContext::SetFile("debug.log");
wxString *thing = new wxString; // WXDEBUG_NEW wxString;
wxDate* date = new wxDate;
@@ -92,9 +92,9 @@ bool MyApp::OnInit(void)
const char *data = (const char*) thing ;
wxDebugContext::PrintClasses();
wxDebugContext::Dump();
wxDebugContext::PrintStatistics();
// wxDebugContext::PrintClasses();
// wxDebugContext::Dump();
// wxDebugContext::PrintStatistics();
// Don't delete these two objects, to force wxApp to flag a memory leak.
// delete thing;