Some #include and #if wxUSE_XX things
Shut up notification in wxTextCtrl Made things compile again... git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2858 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -16,6 +16,10 @@
|
||||
#pragma interface "docmdi.h"
|
||||
#endif
|
||||
|
||||
#include "wx/defs.h"
|
||||
|
||||
#if wxUSE_MDI_ARCHITECTURE
|
||||
|
||||
#include "wx/docview.h"
|
||||
#include "wx/mdi.h"
|
||||
|
||||
@@ -79,5 +83,8 @@ DECLARE_EVENT_TABLE()
|
||||
|
||||
};
|
||||
|
||||
#endif
|
||||
// wxUSE_MDI_ARCHITECTURE
|
||||
|
||||
#endif
|
||||
// _WX_DOCMDI_H_
|
||||
|
@@ -22,6 +22,7 @@
|
||||
#include "wx/object.h"
|
||||
#include "wx/control.h"
|
||||
#include "wx/bitmap.h"
|
||||
#include "wx/icon.h"
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// classes
|
||||
@@ -66,8 +67,7 @@ public:
|
||||
const wxBitmap& GetBitmap() const { return m_bitmap; }
|
||||
|
||||
// for compatibility with wxMSW
|
||||
wxIcon& GetIcon()
|
||||
{ return *(wxDynamicCast(&m_bitmap, wxIcon)); }
|
||||
wxIcon& GetIcon();
|
||||
|
||||
private:
|
||||
wxBitmap m_bitmap;
|
||||
|
@@ -22,6 +22,7 @@
|
||||
#include "wx/object.h"
|
||||
#include "wx/control.h"
|
||||
#include "wx/bitmap.h"
|
||||
#include "wx/icon.h"
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// classes
|
||||
@@ -66,8 +67,7 @@ public:
|
||||
const wxBitmap& GetBitmap() const { return m_bitmap; }
|
||||
|
||||
// for compatibility with wxMSW
|
||||
wxIcon& GetIcon()
|
||||
{ return *(wxDynamicCast(&m_bitmap, wxIcon)); }
|
||||
wxIcon& GetIcon();
|
||||
|
||||
private:
|
||||
wxBitmap m_bitmap;
|
||||
|
@@ -8,9 +8,18 @@
|
||||
// Copyright: (c) 1997, 1998 Guilhem Lavaux
|
||||
// Licence: wxWindows license
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#ifndef _WX_NETWORK_ADDRESS_H
|
||||
#define _WX_NETWORK_ADDRESS_H
|
||||
|
||||
#ifdef __GNUG__
|
||||
#pragma interface
|
||||
#endif
|
||||
|
||||
#include "wx/defs.h"
|
||||
|
||||
#if wxUSE_SOCKETS
|
||||
|
||||
#if defined(__WINDOWS__) && defined(WXSOCK_INTERNAL)
|
||||
#include <winsock.h>
|
||||
|
||||
@@ -21,15 +30,7 @@
|
||||
#include <netinet/in.h>
|
||||
#endif
|
||||
|
||||
#ifdef __GNUG__
|
||||
#pragma interface
|
||||
#endif
|
||||
|
||||
#ifdef WXPREC
|
||||
#include <wx/wxprec.h>
|
||||
#else
|
||||
#include <wx/wx.h>
|
||||
#endif
|
||||
#include "wx/string.h"
|
||||
|
||||
class WXDLLEXPORT wxSockAddress : public wxObject {
|
||||
DECLARE_ABSTRACT_CLASS(wxSockAddress)
|
||||
@@ -132,5 +133,10 @@ public:
|
||||
inline int Type() { return wxSockAddress::UNIX; }
|
||||
};
|
||||
#endif
|
||||
// __UNIX__
|
||||
|
||||
#endif
|
||||
// wxUSE_SOCKETS
|
||||
|
||||
#endif
|
||||
// _WX_NETWORK_ADDRESS_H
|
||||
|
@@ -15,12 +15,14 @@
|
||||
#pragma interface
|
||||
#endif
|
||||
|
||||
#include "wx/defs.h"
|
||||
|
||||
#if wxUSE_SOCKETS
|
||||
|
||||
#include <wx/object.h>
|
||||
#include <wx/list.h>
|
||||
#include <wx/socket.h>
|
||||
#include <wx/thread.h>
|
||||
#include "wx/object.h"
|
||||
#include "wx/list.h"
|
||||
#include "wx/socket.h"
|
||||
#include "wx/thread.h"
|
||||
|
||||
// Socket state
|
||||
class SocketState
|
||||
|
Reference in New Issue
Block a user