Update to docs incl. wxString first stab; added a couple of palette-related events (wxMSW)

needed for wxGLCanvas


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@392 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
1998-07-29 06:51:33 +00:00
parent 9746a2ba50
commit f7bd26981f
27 changed files with 600 additions and 1545 deletions

View File

@@ -40,7 +40,7 @@ IMPLEMENT_CLASS(wxDocMDIParentFrame, wxMDIParentFrame)
BEGIN_EVENT_TABLE(wxDocMDIParentFrame, wxMDIParentFrame)
EVT_MENU(wxID_EXIT, wxDocMDIParentFrame::OnExit)
EVT_MENU_RANGE(wxID_FILE1, wxID_FILE2, wxDocMDIParentFrame::OnMRUFile)
EVT_MENU_RANGE(wxID_FILE1, wxID_FILE9, wxDocMDIParentFrame::OnMRUFile)
END_EVENT_TABLE()
wxDocMDIParentFrame::wxDocMDIParentFrame(wxDocManager *manager, wxFrame *frame, wxWindowID id, const wxString& title,

View File

@@ -34,6 +34,9 @@
#include "wx/menu.h"
#include "wx/list.h"
#include "wx/filedlg.h"
#endif
#ifdef __WXGTK__
#include "wx/mdi.h"
#endif
@@ -490,9 +493,11 @@ void wxView::OnChangeFilename(void)
wxFrame *frame = NULL;
wxMDIChildFrame *mdi_frame = NULL;
#ifdef __WXGTK__
if (GetFrame()->IsKindOf(CLASSINFO(wxMDIChildFrame)))
mdi_frame = (wxMDIChildFrame*)GetFrame();
else
#endif
frame = GetFrame();
if (frame)
@@ -500,7 +505,7 @@ void wxView::OnChangeFilename(void)
frame->SetTitle(name);
return;
}
#ifdef __WXGTK__
if (mdi_frame)
{
if (wxTheApp->GetAppName() != "")
@@ -512,6 +517,7 @@ void wxView::OnChangeFilename(void)
else
mdi_frame->SetTitle(name);
}
#endif
}
}
@@ -1399,7 +1405,7 @@ bool wxDocChildFrame::OnClose(void)
BEGIN_EVENT_TABLE(wxDocParentFrame, wxFrame)
EVT_MENU(wxID_EXIT, wxDocParentFrame::OnExit)
EVT_MENU_RANGE(wxID_FILE1, wxID_FILE2, wxDocParentFrame::OnMRUFile)
EVT_MENU_RANGE(wxID_FILE1, wxID_FILE9, wxDocParentFrame::OnMRUFile)
END_EVENT_TABLE()
wxDocParentFrame::wxDocParentFrame(wxDocManager *manager, wxFrame *frame, wxWindowID id, const wxString& title,

View File

@@ -56,6 +56,8 @@ IMPLEMENT_DYNAMIC_CLASS(wxSysColourChangedEvent, wxEvent)
IMPLEMENT_DYNAMIC_CLASS(wxIdleEvent, wxEvent)
IMPLEMENT_DYNAMIC_CLASS(wxUpdateUIEvent, wxEvent)
IMPLEMENT_DYNAMIC_CLASS(wxNavigationKeyEvent, wxCommandEvent)
IMPLEMENT_DYNAMIC_CLASS(wxPaletteChangedEvent, wxEvent)
IMPLEMENT_DYNAMIC_CLASS(wxQueryNewPaletteEvent, wxEvent)
const wxEventTable *wxEvtHandler::GetEventTable() const { return &wxEvtHandler::sm_eventTable; }

View File

@@ -1366,6 +1366,16 @@ long wxWindow::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
return MSWDefWindowProc(message, wParam, lParam );
break;
}
case WM_PALETTECHANGED:
{
return MSWOnPaletteChanged((WXHWND) (HWND) wParam);
break;
}
case WM_QUERYNEWPALETTE:
{
return MSWOnQueryNewPalette();
break;
}
case WM_ERASEBKGND:
{
// Prevents flicker when dragging
@@ -1862,7 +1872,7 @@ WXHBRUSH wxWindow::OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
bool wxWindow::MSWOnColorChange(WXHWND hWnd, WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
{
wxSysColourChangedEvent event;
event.m_eventObject = this;
event.SetEventObject(this);
// Check if app handles this.
if (GetEventHandler()->ProcessEvent(event))
@@ -1872,6 +1882,27 @@ bool wxWindow::MSWOnColorChange(WXHWND hWnd, WXUINT message, WXWPARAM wParam, WX
return 1;
}
long wxWindow::MSWOnPaletteChanged(WXHWND hWndPalChange)
{
wxPaletteChangedEvent event(GetId());
event.SetEventObject(this);
event.SetChangedWindow(wxFindWinFromHandle(hWndPalChange));
GetEventHandler()->ProcessEvent(event);
return 0;
}
long wxWindow::MSWOnQueryNewPalette()
{
wxQueryNewPaletteEvent event(GetId());
event.SetEventObject(this);
if (!GetEventHandler()->ProcessEvent(event) || !event.GetPaletteRealized())
{
return (long) FALSE;
}
else
return (long) TRUE;
}
// Responds to colour changes: passes event on to children.
void wxWindow::OnSysColourChanged(wxSysColourChangedEvent& event)
{