no message

[wxWidgets.git] / src / gtk / window.cpp

diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp
index 4d375355ffc34eb3f98cbe262e710e22e88a008a..b047fa90832e22312cb97b85c921d2bf5839dba3 100644 (file)
--- a/src/gtk/window.cpp
+++ b/src/gtk/window.cpp
@@ -21,18 +21,23 @@
 #include "wx/utils.h"
 #include "wx/dialog.h"
 #include "wx/msgdlg.h"
 #include "wx/utils.h"
 #include "wx/dialog.h"
 #include "wx/msgdlg.h"

-#include "wx/dcclient.h"
+#if wxUSE_DRAG_AND_DROP

 #include "wx/dnd.h"
 #include "wx/dnd.h"

+#endif

 #include "wx/menu.h"
 #include "wx/statusbr.h"
 #include "wx/intl.h"
 #include "wx/settings.h"
 #include "wx/log.h"
 #include "wx/menu.h"
 #include "wx/statusbr.h"
 #include "wx/intl.h"
 #include "wx/settings.h"
 #include "wx/log.h"

-#include "gdk/gdkprivate.h"
-#include "gdk/gdkkeysyms.h"

 
 #include <math.h>
 
 
 #include <math.h>
 

+#include "gdk/gdk.h"
+#include "gtk/gtk.h"
+#include "gdk/gdkprivate.h"
+#include "gdk/gdkkeysyms.h"
+#include "wx/gtk/win_gtk.h"
+

 //-----------------------------------------------------------------------------
 // documentation on internals
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // documentation on internals
 //-----------------------------------------------------------------------------


@@ -1162,7 +1167,9 @@ wxWindow::wxWindow()
     m_isShown = FALSE;
     m_isEnabled = TRUE;
 
     m_isShown = FALSE;
     m_isEnabled = TRUE;
 

+#if wxUSE_DRAG_AND_DROP

     m_dropTarget = (wxDropTarget*) NULL;
     m_dropTarget = (wxDropTarget*) NULL;

+#endif

     m_resizing = FALSE;
     m_scrollGC = (GdkGC*) NULL;
     m_widgetStyle = (GtkStyle*) NULL;
     m_resizing = FALSE;
     m_scrollGC = (GdkGC*) NULL;
     m_widgetStyle = (GtkStyle*) NULL;


@@ -1328,7 +1335,9 @@ wxWindow::~wxWindow()
 {
     m_hasVMT = FALSE;
 
 {
     m_hasVMT = FALSE;
 

+#if wxUSE_DRAG_AND_DROP

     if (m_dropTarget) delete m_dropTarget;
     if (m_dropTarget) delete m_dropTarget;

+#endif

 
     if (m_parent) m_parent->RemoveChild( this );
     if (m_widget) Show( FALSE );
 
     if (m_parent) m_parent->RemoveChild( this );
     if (m_widget) Show( FALSE );


@@ -1447,7 +1456,9 @@ void wxWindow::PreCreation( wxWindow *parent, wxWindowID id,
     m_isShown = FALSE;
     m_isEnabled = TRUE;
 
     m_isShown = FALSE;
     m_isEnabled = TRUE;
 

+#if wxUSE_DRAG_AND_DROP

     m_dropTarget = (wxDropTarget *) NULL;
     m_dropTarget = (wxDropTarget *) NULL;

+#endif

     m_resizing = FALSE;
     m_windowValidator = (wxValidator *) NULL;
     m_scrollGC = (GdkGC*) NULL;
     m_resizing = FALSE;
     m_windowValidator = (wxValidator *) NULL;
     m_scrollGC = (GdkGC*) NULL;


@@ -1616,8 +1627,8 @@ void wxWindow::SetSize( int x, int y, int width, int height, int sizeFlags )
 
         if ((m_minWidth != -1) && (m_width < m_minWidth)) m_width = m_minWidth;
         if ((m_minHeight != -1) && (m_height < m_minHeight)) m_height = m_minHeight;
 
         if ((m_minWidth != -1) && (m_width < m_minWidth)) m_width = m_minWidth;
         if ((m_minHeight != -1) && (m_height < m_minHeight)) m_height = m_minHeight;

-        if ((m_maxWidth != -1) && (m_width > m_maxWidth)) m_width = m_minWidth;
-        if ((m_maxHeight != -1) && (m_height > m_maxHeight)) m_height = m_minHeight;
+        if ((m_maxWidth != -1) && (m_width > m_maxWidth)) m_width = m_maxWidth;
+        if ((m_maxHeight != -1) && (m_height > m_maxHeight)) m_height = m_maxHeight;

 
         wxPoint pt( m_parent->GetClientAreaOrigin() );
         gtk_myfixed_move( GTK_MYFIXED(m_parent->m_wxwindow), m_widget, m_x+pt.x, m_y+pt.y );
 
         wxPoint pt( m_parent->GetClientAreaOrigin() );
         gtk_myfixed_move( GTK_MYFIXED(m_parent->m_wxwindow), m_widget, m_x+pt.x, m_y+pt.y );


@@ -2190,6 +2201,11 @@ void wxWindow::SetCursor( const wxCursor &cursor )
          gdk_window_set_cursor( m_wxwindow->window, m_cursor->GetCursor() );
 }
 
          gdk_window_set_cursor( m_wxwindow->window, m_cursor->GetCursor() );
 }
 

+void wxWindow::WarpPointer( int WXUNUSED(x), int WXUNUSED(y) )
+{
+  // TODO
+}
+

 void wxWindow::Refresh( bool eraseBackground, const wxRect *rect )
 {
     wxCHECK_RET( (m_widget != NULL), "invalid window" );
 void wxWindow::Refresh( bool eraseBackground, const wxRect *rect )
 {
     wxCHECK_RET( (m_widget != NULL), "invalid window" );


@@ -2479,6 +2495,8 @@ bool wxWindow::PopupMenu( wxMenu *menu, int WXUNUSED(x), int WXUNUSED(y) )
     return TRUE;
 }
 
     return TRUE;
 }
 

+#if wxUSE_DRAG_AND_DROP
+

 void wxWindow::SetDropTarget( wxDropTarget *dropTarget )
 {
     wxCHECK_RET( m_widget != NULL, "invalid window" );
 void wxWindow::SetDropTarget( wxDropTarget *dropTarget )
 {
     wxCHECK_RET( m_widget != NULL, "invalid window" );


@@ -2498,6 +2516,8 @@ wxDropTarget *wxWindow::GetDropTarget() const
     return m_dropTarget;
 }
 
     return m_dropTarget;
 }
 

+#endif
+

 GtkWidget* wxWindow::GetConnectWidget()
 {
     GtkWidget *connect_widget = m_widget;
 GtkWidget* wxWindow::GetConnectWidget()
 {
     GtkWidget *connect_widget = m_widget;