tons of fixes for wxGTK/Univ - seems to work, more or less, now

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10805 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

src/gtk1/files.lst

@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 20:23, 2001/07/02
+# This file was automatically generated by tmake at 21:37, 2001/07/03
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE GTK.T!
 ALL_SOURCES = \
 		generic/accel.cpp \
@@ -33,6 +33,8 @@ ALL_SOURCES = \
 		generic/propform.cpp \
 		generic/proplist.cpp \
 		generic/sashwin.cpp \
+		generic/scrlwing.cpp \
+		generic/spinctlg.cpp \
 		generic/splash.cpp \
 		generic/splitter.cpp \
 		generic/statusbr.cpp \
@@ -85,6 +87,7 @@ ALL_SOURCES = \
 		common/fs_mem.cpp \
 		common/fs_zip.cpp \
 		common/ftp.cpp \
+		common/gaugecmn.cpp \
 		common/gdicmn.cpp \
 		common/geometry.cpp \
 		common/gifdecod.cpp \
@@ -628,6 +631,7 @@ COMMONOBJS = \
 		fs_mem.o \
 		fs_zip.o \
 		ftp.o \
+		gaugecmn.o \
 		gdicmn.o \
 		geometry.o \
 		gifdecod.o \
@@ -743,6 +747,7 @@ COMMONDEPS = \
 		fs_mem.d \
 		fs_zip.d \
 		ftp.d \
+		gaugecmn.d \
 		gdicmn.d \
 		geometry.d \
 		gifdecod.d \
@@ -848,6 +853,8 @@ GENERICOBJS = \
 		propform.o \
 		proplist.o \
 		sashwin.o \
+		scrlwing.o \
+		spinctlg.o \
 		splash.o \
 		splitter.o \
 		statusbr.o \
@@ -893,6 +900,8 @@ GENERICDEPS = \
 		propform.d \
 		proplist.d \
 		sashwin.d \
+		scrlwing.d \
+		spinctlg.d \
 		splash.d \
 		splitter.d \
 		statusbr.d \
@@ -1031,6 +1040,7 @@ GUI_LOWLEVEL_OBJS = \
 		app.o \
 		bitmap.o \
 		brush.o \
+		choice.o \
 		clipbrd.o \
 		colour.o \
 		cursor.o \
@@ -1041,15 +1051,19 @@ GUI_LOWLEVEL_OBJS = \
 		dcmemory.o \
 		dcscreen.o \
 		dialog.o \
+		dnd.o \
 		font.o \
 		frame.o \
 		gdiobj.o \
+		gsockgtk.o \
 		icon.o \
 		main.o \
 		pen.o \
 		region.o \
 		settings.o \
+		tbargtk.o \
 		timer.o \
+		tooltip.o \
 		utilsgtk.o \
 		win_gtk.o \
 		window.o
@@ -1058,6 +1072,7 @@ GUI_LOWLEVEL_DEPS = \
 		app.d \
 		bitmap.d \
 		brush.d \
+		choice.d \
 		clipbrd.d \
 		colour.d \
 		cursor.d \
@@ -1068,15 +1083,19 @@ GUI_LOWLEVEL_DEPS = \
 		dcmemory.d \
 		dcscreen.d \
 		dialog.d \
+		dnd.d \
 		font.d \
 		frame.d \
 		gdiobj.d \
+		gsockgtk.d \
 		icon.d \
 		main.d \
 		pen.d \
 		region.d \
 		settings.d \
+		tbargtk.d \
 		timer.d \
+		tooltip.d \
 		utilsgtk.d \
 		win_gtk.d \
 		window.d

src/gtk1/region.cpp

@@ -766,10 +766,8 @@ wxCoord wxRegionIterator::GetH() const
 wxRect wxRegionIterator::GetRect() const
 {
     wxRect r;
-    wxNode *node = m_region.GetRectList()->Nth( m_current );
-
-    if (node)
-        r = *((wxRect*)node->Data());
+    if( HaveRects() )
+        r = ((wxRIRefData*)m_refData)->m_rects[m_current];
 
     return r;
 }

src/gtk1/scrolwin.cpp

@@ -775,3 +775,4 @@ void wxScrolledWindow::OnChar(wxKeyEvent& event)
             event.Skip();
     }
 }
+

src/gtk1/textctrl.cpp

@@ -80,7 +80,6 @@ gtk_scrollbar_changed_callback( GtkWidget *WXUNUSED(widget), wxTextCtrl *win )
 // "focus_in_event"
 //-----------------------------------------------------------------------------
 
-wxWindow *FindFocusedChild(wxWindow *win);
 extern wxWindow  *g_focusWindow;
 extern bool       g_blockEventsOnDrag;
 // extern bool g_isIdle;
@@ -152,7 +151,7 @@ static gint gtk_text_focus_out_callback( GtkWidget *widget, GdkEvent *WXUNUSED(e
     g_sendActivateEvent = 0;
 #endif
 
-    wxWindow *winFocus = FindFocusedChild(win);
+    wxWindow *winFocus = wxFindFocusedChild(win);
     if ( winFocus )
         win = winFocus;
 

src/gtk1/window.cpp

@@ -333,25 +333,25 @@ extern bool g_isIdle;
 // returns the child of win which currently has focus or NULL if not found
 //
 // Note: can't be static, needed by textctrl.cpp.
-wxWindow *FindFocusedChild(wxWindowGTK *win)
+wxWindow *wxFindFocusedChild(wxWindowGTK *win)
 {
-    wxWindowGTK *winFocus = wxWindowGTK::FindFocus();
+    wxWindow *winFocus = wxWindowGTK::FindFocus();
     if ( !winFocus )
-        return (wxWindowGTK *)NULL;
+        return (wxWindow *)NULL;
 
     if ( winFocus == win )
-        return win;
+        return (wxWindow *)win;
 
     for ( wxWindowList::Node *node = win->GetChildren().GetFirst();
           node;
           node = node->GetNext() )
     {
-        wxWindowGTK *child = FindFocusedChild(node->GetData());
+        wxWindow *child = wxFindFocusedChild(node->GetData());
         if ( child )
             return child;
     }
 
-    return (wxWindowGTK *)NULL;
+    return (wxWindow *)NULL;
 }
 
 static void draw_frame( GtkWidget *widget, wxWindowGTK *win )
@@ -1749,7 +1749,7 @@ static gint gtk_window_focus_out_callback( GtkWidget *widget, GdkEvent *WXUNUSED
     // g_sendActivateEvent to -1
     g_sendActivateEvent = 0;
 
-    wxWindowGTK *winFocus = FindFocusedChild(win);
+    wxWindowGTK *winFocus = wxFindFocusedChild(win);
     if ( winFocus )
         win = winFocus;
 
@@ -3067,7 +3067,7 @@ bool wxWindowGTK::Show( bool show )
     return TRUE;
 }
 
-static void wxWindowNotifyEnable(wxWindow* win, bool enable)
+static void wxWindowNotifyEnable(wxWindowGTK* win, bool enable)
 {
     win->OnParentEnable(enable);
 
@@ -3084,7 +3084,7 @@ static void wxWindowNotifyEnable(wxWindow* win, bool enable)
     }
 }
 
-bool wxWindow::Enable( bool enable )
+bool wxWindowGTK::Enable( bool enable )
 {
     wxCHECK_MSG( (m_widget != NULL), FALSE, wxT("invalid window") );
 
@@ -3394,7 +3394,7 @@ void wxWindowGTK::DoSetToolTip( wxToolTip *tip )
     wxWindowBase::DoSetToolTip(tip);
 
     if (m_tooltip)
-        m_tooltip->Apply( this );
+        m_tooltip->Apply( (wxWindow *)this );
 }
 
 void wxWindowGTK::ApplyToolTip( GtkTooltips *tips, const wxChar *tip )