Wrong #pragma interface/implementation warning fixes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33197 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -18,8 +18,8 @@
|
|||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
|
|
||||||
#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
|
#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
|
||||||
#pragma implementation "nettest.cpp"
|
#pragma implementation
|
||||||
#pragma interface "nettest.cpp"
|
#pragma interface
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// For compilers that support precompilation, includes "wx/wx.h".
|
// For compilers that support precompilation, includes "wx/wx.h".
|
||||||
|
@@ -18,8 +18,8 @@
|
|||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
|
|
||||||
#if defined(__GNUG__) && !defined(__APPLE__)
|
#if defined(__GNUG__) && !defined(__APPLE__)
|
||||||
#pragma implementation "drawing.cpp"
|
#pragma implementation
|
||||||
#pragma interface "drawing.cpp"
|
#pragma interface
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// For compilers that support precompilation, includes "wx/wx.h".
|
// For compilers that support precompilation, includes "wx/wx.h".
|
||||||
@@ -523,7 +523,7 @@ void MyCanvas::DrawDefault(wxDC& dc)
|
|||||||
dc.GetPixel(1,1, &tmpColour);
|
dc.GetPixel(1,1, &tmpColour);
|
||||||
dc.FloodFill(1,1, tmpColour, wxFLOOD_SURFACE);
|
dc.FloodFill(1,1, tmpColour, wxFLOOD_SURFACE);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
dc.DrawCheckMark(5, 80, 15, 15);
|
dc.DrawCheckMark(5, 80, 15, 15);
|
||||||
dc.DrawCheckMark(25, 80, 30, 30);
|
dc.DrawCheckMark(25, 80, 30, 30);
|
||||||
dc.DrawCheckMark(60, 80, 60, 60);
|
dc.DrawCheckMark(60, 80, 60, 60);
|
||||||
|
@@ -10,8 +10,8 @@
|
|||||||
/////////////////////////////////////////////////////////////////////////////
|
/////////////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
#if defined(__GNUG__) && !defined(__APPLE__)
|
#if defined(__GNUG__) && !defined(__APPLE__)
|
||||||
#pragma implementation "dynamic.cpp"
|
#pragma implementation
|
||||||
#pragma interface "dynamic.cpp"
|
#pragma interface
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// For compilers that support precompilation, includes "wx/wx.h".
|
// For compilers that support precompilation, includes "wx/wx.h".
|
||||||
@@ -60,9 +60,9 @@ bool MyApp::OnInit(void)
|
|||||||
MyFrame *frame = new MyFrame(NULL, _T("Dynamic wxWidgets App"), 50, 50, 450, 340);
|
MyFrame *frame = new MyFrame(NULL, _T("Dynamic wxWidgets App"), 50, 50, 450, 340);
|
||||||
|
|
||||||
// You used to have to do some casting for param 4, but now there are type-safe handlers
|
// You used to have to do some casting for param 4, but now there are type-safe handlers
|
||||||
frame->Connect( DYNAMIC_QUIT, wxID_ANY,
|
frame->Connect( DYNAMIC_QUIT, wxID_ANY,
|
||||||
wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(MyFrame::OnQuit) );
|
wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(MyFrame::OnQuit) );
|
||||||
frame->Connect( DYNAMIC_ABOUT, wxID_ANY,
|
frame->Connect( DYNAMIC_ABOUT, wxID_ANY,
|
||||||
wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(MyFrame::OnAbout) );
|
wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(MyFrame::OnAbout) );
|
||||||
|
|
||||||
// Give it an icon
|
// Give it an icon
|
||||||
|
@@ -18,8 +18,8 @@
|
|||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
|
|
||||||
#if defined(__GNUG__) && !defined(__APPLE__)
|
#if defined(__GNUG__) && !defined(__APPLE__)
|
||||||
#pragma implementation "erase.cpp"
|
#pragma implementation
|
||||||
#pragma interface "erase.cpp"
|
#pragma interface
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// For compilers that support precompilation, includes "wx/wx.h".
|
// For compilers that support precompilation, includes "wx/wx.h".
|
||||||
@@ -213,7 +213,7 @@ MyCanvas::MyCanvas( wxFrame *parent )
|
|||||||
m_bitmap = wxBitmap( wxICON(mondrian) );
|
m_bitmap = wxBitmap( wxICON(mondrian) );
|
||||||
|
|
||||||
new wxStaticBitmap( this, wxID_ANY, m_bitmap, wxPoint(80,20) );
|
new wxStaticBitmap( this, wxID_ANY, m_bitmap, wxPoint(80,20) );
|
||||||
|
|
||||||
SetFocusIgnoringChildren();
|
SetFocusIgnoringChildren();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -341,7 +341,7 @@ void MyCanvas::OnEraseBackground( wxEraseEvent& event )
|
|||||||
dc.SetPen(*wxGREEN_PEN);
|
dc.SetPen(*wxGREEN_PEN);
|
||||||
|
|
||||||
PrepareDC( dc );
|
PrepareDC( dc );
|
||||||
|
|
||||||
// clear any junk currently displayed
|
// clear any junk currently displayed
|
||||||
dc.Clear();
|
dc.Clear();
|
||||||
|
|
||||||
|
@@ -18,8 +18,8 @@
|
|||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
|
|
||||||
#if defined(__GNUG__) && !defined(__APPLE__)
|
#if defined(__GNUG__) && !defined(__APPLE__)
|
||||||
#pragma implementation "exec.cpp"
|
#pragma implementation
|
||||||
#pragma interface "exec.cpp"
|
#pragma interface
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// For compilers that support precompilation, includes "wx/wx.h".
|
// For compilers that support precompilation, includes "wx/wx.h".
|
||||||
@@ -1028,7 +1028,7 @@ void MyPipedProcess::OnTerminate(int pid, int status)
|
|||||||
|
|
||||||
bool MyPipedProcess2::HasInput()
|
bool MyPipedProcess2::HasInput()
|
||||||
{
|
{
|
||||||
if ( !!m_input )
|
if ( !m_input.empty() )
|
||||||
{
|
{
|
||||||
wxTextOutputStream os(*GetOutputStream());
|
wxTextOutputStream os(*GetOutputStream());
|
||||||
os.WriteString(m_input);
|
os.WriteString(m_input);
|
||||||
|
@@ -4,8 +4,8 @@
|
|||||||
/////////////////////////////////////////////////////////////////////////////
|
/////////////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
#if defined(__GNUG__) && !defined(__APPLE__)
|
#if defined(__GNUG__) && !defined(__APPLE__)
|
||||||
#pragma implementation "help.cpp"
|
#pragma implementation
|
||||||
#pragma interface "help.cpp"
|
#pragma interface
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// For compilers that support precompilation, includes "wx/wx.h".
|
// For compilers that support precompilation, includes "wx/wx.h".
|
||||||
@@ -60,7 +60,7 @@
|
|||||||
void OnClose(wxCloseEvent& event);
|
void OnClose(wxCloseEvent& event);
|
||||||
private:
|
private:
|
||||||
wxHtmlHelpController help;
|
wxHtmlHelpController help;
|
||||||
|
|
||||||
// any class wishing to process wxWidgets events must use this macro
|
// any class wishing to process wxWidgets events must use this macro
|
||||||
DECLARE_EVENT_TABLE()
|
DECLARE_EVENT_TABLE()
|
||||||
};
|
};
|
||||||
@@ -108,11 +108,11 @@
|
|||||||
bool MyApp::OnInit()
|
bool MyApp::OnInit()
|
||||||
{
|
{
|
||||||
wxInitAllImageHandlers();
|
wxInitAllImageHandlers();
|
||||||
#if wxUSE_STREAMS && wxUSE_ZIPSTREAM && wxUSE_ZLIB
|
#if wxUSE_STREAMS && wxUSE_ZIPSTREAM && wxUSE_ZLIB
|
||||||
wxFileSystem::AddHandler(new wxZipFSHandler);
|
wxFileSystem::AddHandler(new wxZipFSHandler);
|
||||||
#endif
|
#endif
|
||||||
SetVendorName(wxT("wxWidgets"));
|
SetVendorName(wxT("wxWidgets"));
|
||||||
SetAppName(wxT("wxHTMLHelp"));
|
SetAppName(wxT("wxHTMLHelp"));
|
||||||
|
|
||||||
// Create the main application window
|
// Create the main application window
|
||||||
MyFrame *frame = new MyFrame(_("HTML Help Sample"),
|
MyFrame *frame = new MyFrame(_("HTML Help Sample"),
|
||||||
@@ -137,7 +137,7 @@
|
|||||||
|
|
||||||
// frame constructor
|
// frame constructor
|
||||||
MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
|
MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
|
||||||
: wxFrame((wxFrame *)NULL, wxID_ANY, title, pos, size),
|
: wxFrame((wxFrame *)NULL, wxID_ANY, title, pos, size),
|
||||||
help(wxHF_DEFAULT_STYLE | wxHF_OPEN_FILES)
|
help(wxHF_DEFAULT_STYLE | wxHF_OPEN_FILES)
|
||||||
{
|
{
|
||||||
// create a menu bar
|
// create a menu bar
|
||||||
@@ -185,7 +185,7 @@
|
|||||||
if ( help.GetFrame() ) // returns NULL if no help frame active
|
if ( help.GetFrame() ) // returns NULL if no help frame active
|
||||||
help.GetFrame()->Close(true);
|
help.GetFrame()->Close(true);
|
||||||
// now we can safely delete the config pointer
|
// now we can safely delete the config pointer
|
||||||
event.Skip();
|
event.Skip();
|
||||||
delete wxConfig::Set(NULL);
|
delete wxConfig::Set(NULL);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -9,8 +9,8 @@
|
|||||||
/////////////////////////////////////////////////////////////////////////////
|
/////////////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
#if defined(__GNUG__) && !defined(__APPLE__)
|
#if defined(__GNUG__) && !defined(__APPLE__)
|
||||||
#pragma implementation "test.cpp"
|
#pragma implementation
|
||||||
#pragma interface "test.cpp"
|
#pragma interface
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// For compilers that support precompilation, includes "wx/wx.h".
|
// For compilers that support precompilation, includes "wx/wx.h".
|
||||||
@@ -191,7 +191,7 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
|
|||||||
SetMenuBar(menuBar);
|
SetMenuBar(menuBar);
|
||||||
|
|
||||||
SetIcon(wxIcon(sample_xpm));
|
SetIcon(wxIcon(sample_xpm));
|
||||||
|
|
||||||
#if wxUSE_ACCEL
|
#if wxUSE_ACCEL
|
||||||
// Create convenient accelerators for Back and Forward navigation
|
// Create convenient accelerators for Back and Forward navigation
|
||||||
wxAcceleratorEntry entries[2];
|
wxAcceleratorEntry entries[2];
|
||||||
|
@@ -6,7 +6,7 @@
|
|||||||
/////////////////////////////////////////////////////////////////////////////
|
/////////////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
#ifdef __GNUG__
|
#ifdef __GNUG__
|
||||||
#pragma implementation "styles.cpp"
|
#pragma implementation "styles.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// For compilers that support precompilation
|
// For compilers that support precompilation
|
||||||
|
@@ -8,7 +8,7 @@
|
|||||||
#define __styles_H__
|
#define __styles_H__
|
||||||
|
|
||||||
#if defined(__GNUG__) && !defined(__APPLE__)
|
#if defined(__GNUG__) && !defined(__APPLE__)
|
||||||
#pragma interface "styles.cpp"
|
#pragma interface "styles.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// Include wxWidgets' headers
|
// Include wxWidgets' headers
|
||||||
|
@@ -6,7 +6,7 @@
|
|||||||
/////////////////////////////////////////////////////////////////////////////
|
/////////////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
#ifdef __GNUG__
|
#ifdef __GNUG__
|
||||||
#pragma implementation "wxedit.cpp"
|
#pragma implementation "wxedit.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// For compilers that support precompilation
|
// For compilers that support precompilation
|
||||||
|
@@ -8,7 +8,7 @@
|
|||||||
#define __wxedit_H__
|
#define __wxedit_H__
|
||||||
|
|
||||||
#if defined(__GNUG__) && !defined(__APPLE__)
|
#if defined(__GNUG__) && !defined(__APPLE__)
|
||||||
#pragma interface "wxedit.cpp"
|
#pragma interface "wxedit.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// Include wxWidgets' headers
|
// Include wxWidgets' headers
|
||||||
|
@@ -17,8 +17,8 @@
|
|||||||
// headers
|
// headers
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
#if defined(__GNUG__) && !defined(__APPLE__)
|
#if defined(__GNUG__) && !defined(__APPLE__)
|
||||||
#pragma implementation "propsize.cpp"
|
#pragma implementation
|
||||||
#pragma interface "propsize.cpp"
|
#pragma interface
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// For compilers that support precompilation, includes "wx/wx.h".
|
// For compilers that support precompilation, includes "wx/wx.h".
|
||||||
|
@@ -18,8 +18,8 @@
|
|||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
|
|
||||||
#if defined(__GNUG__) && !defined(__APPLE__)
|
#if defined(__GNUG__) && !defined(__APPLE__)
|
||||||
#pragma implementation "shaped.cpp"
|
#pragma implementation
|
||||||
#pragma interface "shaped.cpp"
|
#pragma interface
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// For compilers that support precompilation, includes "wx/wx.h".
|
// For compilers that support precompilation, includes "wx/wx.h".
|
||||||
|
@@ -18,8 +18,8 @@
|
|||||||
// --------------------------------------------------------------------------
|
// --------------------------------------------------------------------------
|
||||||
|
|
||||||
#if defined(__GNUG__) && !defined(__APPLE__)
|
#if defined(__GNUG__) && !defined(__APPLE__)
|
||||||
# pragma implementation "client.cpp"
|
#pragma implementation
|
||||||
# pragma interface "client.cpp"
|
#pragma interface
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// For compilers that support precompilation, includes "wx/wx.h".
|
// For compilers that support precompilation, includes "wx/wx.h".
|
||||||
|
@@ -18,8 +18,8 @@
|
|||||||
// --------------------------------------------------------------------------
|
// --------------------------------------------------------------------------
|
||||||
|
|
||||||
#if defined(__GNUG__) && !defined(__APPLE__)
|
#if defined(__GNUG__) && !defined(__APPLE__)
|
||||||
# pragma implementation "server.cpp"
|
#pragma implementation
|
||||||
# pragma interface "server.cpp"
|
#pragma interface
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// For compilers that support precompilation, includes "wx/wx.h".
|
// For compilers that support precompilation, includes "wx/wx.h".
|
||||||
|
Reference in New Issue
Block a user