some very minor changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1176 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -85,9 +85,7 @@ protected:
|
|||||||
|
|
||||||
class WXDLLEXPORT wxTabLayer: public wxList
|
class WXDLLEXPORT wxTabLayer: public wxList
|
||||||
{
|
{
|
||||||
// Why did someone remove this, please?
|
DECLARE_DYNAMIC_CLASS(wxTabLayer)
|
||||||
DECLARE_DYNAMIC_CLASS(wxTabLayer)
|
|
||||||
wxTabLayer():wxList() {}
|
|
||||||
};
|
};
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@@ -806,11 +806,11 @@ wxFrame *wxLogWindow::GetFrame() const
|
|||||||
return m_pLogFrame;
|
return m_pLogFrame;
|
||||||
}
|
}
|
||||||
|
|
||||||
void wxLogWindow::OnFrameCreate(wxFrame *WXUNUSED(frame))
|
void wxLogWindow::OnFrameCreate(wxFrame * WXUNUSED(frame))
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
void wxLogWindow::OnFrameDelete(wxFrame *WXUNUSED(frame))
|
void wxLogWindow::OnFrameDelete(wxFrame * WXUNUSED(frame))
|
||||||
{
|
{
|
||||||
m_pLogFrame = (wxLogFrame *)NULL;
|
m_pLogFrame = (wxLogFrame *)NULL;
|
||||||
}
|
}
|
||||||
|
@@ -152,7 +152,8 @@ static void gtk_menu_clicked_callback( GtkWidget *widget, wxMenu *menu )
|
|||||||
{
|
{
|
||||||
int id = menu->FindMenuIdByMenuItem(widget);
|
int id = menu->FindMenuIdByMenuItem(widget);
|
||||||
|
|
||||||
wxASSERT( id != -1 ); // should find it!
|
// should find it for normal (not popup) menu
|
||||||
|
wxASSERT( (id != -1) || (menu->GetInvokingWindow() != NULL) );
|
||||||
|
|
||||||
if (!menu->IsEnabled(id)) return;
|
if (!menu->IsEnabled(id)) return;
|
||||||
|
|
||||||
|
@@ -152,7 +152,8 @@ static void gtk_menu_clicked_callback( GtkWidget *widget, wxMenu *menu )
|
|||||||
{
|
{
|
||||||
int id = menu->FindMenuIdByMenuItem(widget);
|
int id = menu->FindMenuIdByMenuItem(widget);
|
||||||
|
|
||||||
wxASSERT( id != -1 ); // should find it!
|
// should find it for normal (not popup) menu
|
||||||
|
wxASSERT( (id != -1) || (menu->GetInvokingWindow() != NULL) );
|
||||||
|
|
||||||
if (!menu->IsEnabled(id)) return;
|
if (!menu->IsEnabled(id)) return;
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user