Some compile warnings removed; file selector prototypes put in each filedlg.h;
Dialog Editor wxGTK makefile hacked git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1482 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -222,7 +222,7 @@ void wxPreviewCanvas::OnSysColourChanged(wxSysColourChangedEvent& event)
|
||||
*/
|
||||
|
||||
BEGIN_EVENT_TABLE(wxPreviewControlBar, wxPanel)
|
||||
EVT_BUTTON(wxID_PREVIEW_CLOSE, wxPreviewControlBar::OnClose)
|
||||
EVT_BUTTON(wxID_PREVIEW_CLOSE, wxPreviewControlBar::OnWindowClose)
|
||||
EVT_BUTTON(wxID_PREVIEW_PRINT, wxPreviewControlBar::OnPrint)
|
||||
EVT_BUTTON(wxID_PREVIEW_PREVIOUS, wxPreviewControlBar::OnPrevious)
|
||||
EVT_BUTTON(wxID_PREVIEW_NEXT, wxPreviewControlBar::OnNext)
|
||||
@@ -259,7 +259,7 @@ void wxPreviewControlBar::OnPaint(wxPaintEvent& WXUNUSED(event))
|
||||
dc.DrawLine( 0, h-1, w, h-1 );
|
||||
}
|
||||
|
||||
void wxPreviewControlBar::OnClose(wxCommandEvent& WXUNUSED(event))
|
||||
void wxPreviewControlBar::OnWindowClose(wxCommandEvent& WXUNUSED(event))
|
||||
{
|
||||
wxPreviewFrame *frame = (wxPreviewFrame *)GetParent();
|
||||
frame->Close(TRUE);
|
||||
|
@@ -168,7 +168,7 @@ void wxMenuBar::SetLabel( int id, const wxString &label )
|
||||
{
|
||||
wxMenuItem* item = FindMenuItemById( id );
|
||||
|
||||
if (item) return item->SetText( label );
|
||||
if (item) item->SetText( label );
|
||||
}
|
||||
|
||||
void wxMenuBar::EnableTop( int pos, bool flag )
|
||||
|
@@ -168,7 +168,7 @@ void wxMenuBar::SetLabel( int id, const wxString &label )
|
||||
{
|
||||
wxMenuItem* item = FindMenuItemById( id );
|
||||
|
||||
if (item) return item->SetText( label );
|
||||
if (item) item->SetText( label );
|
||||
}
|
||||
|
||||
void wxMenuBar::EnableTop( int pos, bool flag )
|
||||
|
@@ -96,7 +96,7 @@ wxString wxFileSelectorEx(const char *title,
|
||||
if ( fileDialog.ShowModal() == wxID_OK )
|
||||
{
|
||||
*defaultFilterIndex = fileDialog.GetFilterIndex();
|
||||
return fileDialog.GetPath());
|
||||
return fileDialog.GetPath();
|
||||
}
|
||||
else
|
||||
return wxEmptyString;
|
||||
|
Reference in New Issue
Block a user