Listctrl updates

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

diff --git a/src/gtk1/window.cpp b/src/gtk1/window.cpp
index 9dc17c0291c202d77fe18046276d520438e697a4..6de4b2c637899fc19c423216ad10a0c422f93cb6 100644 (file)
--- a/src/gtk1/window.cpp
+++ b/src/gtk1/window.cpp
@@ -140,7 +140,6 @@ static guint32 gs_timeLastClick = 0;
 static void gtk_window_expose_callback( GtkWidget *WXUNUSED(widget), GdkEventExpose *gdk_event, wxWindow *win )
 {
     if (!win->HasVMT()) return;
-    if (g_blockEventsOnDrag) return;
 
     win->m_updateRegion.Union( gdk_event->area.x,
                                gdk_event->area.y,
@@ -170,7 +169,6 @@ static void gtk_window_expose_callback( GtkWidget *WXUNUSED(widget), GdkEventExp
 static void gtk_window_draw_callback( GtkWidget *WXUNUSED(widget), GdkRectangle *rect, wxWindow *win )
 {
     if (!win->HasVMT()) return;
-    if (g_blockEventsOnDrag) return;
 
     win->m_updateRegion.Union( rect->x, rect->y, rect->width, rect->height );
 
@@ -1197,7 +1195,7 @@ void wxWindow::PreCreation( wxWindow *parent, wxWindowID id,
   
     m_eventHandler = this;
   
-    m_windowId = id;
+    m_windowId = id == -1 ? wxNewId() : id;
   
     m_sizeSet = FALSE;
   
@@ -1446,14 +1444,14 @@ void wxWindow::SetClientSize( int width, int height )
 
     if (!m_hasScrolling)
     {
-/*
-      do we have sunken dialogs ?
-
       GtkStyleClass *window_class = m_wxwindow->style->klass;
 
-      dw += 2 * window_class->xthickness;
-      dh += 2 * window_class->ythickness;
-*/
+      if ((m_windowStyle & wxRAISED_BORDER) ||
+          (m_windowStyle & wxSUNKEN_BORDER))
+      {
+        dw += 2 * window_class->xthickness;
+        dh += 2 * window_class->ythickness;
+      }
     }
     else
     {
@@ -1511,14 +1509,14 @@ void wxWindow::GetClientSize( int *width, int *height ) const
 
     if (!m_hasScrolling)
     {
-/*
-      do we have sunken dialogs ?
-
       GtkStyleClass *window_class = m_wxwindow->style->klass;
 
-      dw += 2 * window_class->xthickness;
-      dh += 2 * window_class->ythickness;
-*/
+      if ((m_windowStyle & wxRAISED_BORDER) ||
+          (m_windowStyle & wxSUNKEN_BORDER))
+      {
+        dw += 2 * window_class->xthickness;
+        dh += 2 * window_class->ythickness;
+      }
     }
     else
     {
@@ -1689,7 +1687,7 @@ void wxWindow::SetSizeHints( int minW, int minH, int maxW, int maxH, int WXUNUSE
 
 void wxWindow::OnSize( wxSizeEvent &WXUNUSED(event) )
 {
-  if (GetAutoLayout()) Layout();
+//  if (GetAutoLayout()) Layout();
 }
 
 bool wxWindow::Show( bool show )