configure and #ifdef wxUSE_XXX updates
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1315 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -21,8 +21,9 @@
|
||||
#include "wx/utils.h"
|
||||
#include "wx/dialog.h"
|
||||
#include "wx/msgdlg.h"
|
||||
#include "wx/dcclient.h"
|
||||
#ifdef wxUSE_DRAG_AND_DROP
|
||||
#include "wx/dnd.h"
|
||||
#endif
|
||||
#include "wx/menu.h"
|
||||
#include "wx/statusbr.h"
|
||||
#include "wx/intl.h"
|
||||
@@ -1166,7 +1167,9 @@ wxWindow::wxWindow()
|
||||
m_isShown = FALSE;
|
||||
m_isEnabled = TRUE;
|
||||
|
||||
#ifdef wxUSE_DRAG_AND_DROP
|
||||
m_dropTarget = (wxDropTarget*) NULL;
|
||||
#endif
|
||||
m_resizing = FALSE;
|
||||
m_scrollGC = (GdkGC*) NULL;
|
||||
m_widgetStyle = (GtkStyle*) NULL;
|
||||
@@ -1332,7 +1335,9 @@ wxWindow::~wxWindow()
|
||||
{
|
||||
m_hasVMT = FALSE;
|
||||
|
||||
#ifdef wxUSE_DRAG_AND_DROP
|
||||
if (m_dropTarget) delete m_dropTarget;
|
||||
#endif
|
||||
|
||||
if (m_parent) m_parent->RemoveChild( this );
|
||||
if (m_widget) Show( FALSE );
|
||||
@@ -1451,7 +1456,9 @@ void wxWindow::PreCreation( wxWindow *parent, wxWindowID id,
|
||||
m_isShown = FALSE;
|
||||
m_isEnabled = TRUE;
|
||||
|
||||
#ifdef wxUSE_DRAG_AND_DROP
|
||||
m_dropTarget = (wxDropTarget *) NULL;
|
||||
#endif
|
||||
m_resizing = FALSE;
|
||||
m_windowValidator = (wxValidator *) NULL;
|
||||
m_scrollGC = (GdkGC*) NULL;
|
||||
@@ -2488,6 +2495,8 @@ bool wxWindow::PopupMenu( wxMenu *menu, int WXUNUSED(x), int WXUNUSED(y) )
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
#ifdef wxUSE_DRAG_AND_DROP
|
||||
|
||||
void wxWindow::SetDropTarget( wxDropTarget *dropTarget )
|
||||
{
|
||||
wxCHECK_RET( m_widget != NULL, "invalid window" );
|
||||
@@ -2507,6 +2516,8 @@ wxDropTarget *wxWindow::GetDropTarget() const
|
||||
return m_dropTarget;
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
GtkWidget* wxWindow::GetConnectWidget()
|
||||
{
|
||||
GtkWidget *connect_widget = m_widget;
|
||||
|
Reference in New Issue
Block a user