It's now possible to drag a listbox filled with entries
Removed #ifdef 0 from resource.cpp around reading code for wxRadioBox #ifdeffed a Refresh call that causes DialogEd to dump code in wxGTK when deleting an item Suppressed some warnings Readded socket stuffto gtk.inc git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@716 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -51,6 +51,7 @@ install::
|
||||
/usr/local/include/wx \
|
||||
/usr/local/include/wx/gtk \
|
||||
/usr/local/include/wx/common \
|
||||
/usr/local/include/wx/protocol \
|
||||
/usr/local/include/wx/generic
|
||||
@echo " Copying headers from /include/wx"
|
||||
@cd $(WXBASEDIR)/include/wx ; \
|
||||
@@ -70,6 +71,12 @@ install::
|
||||
rm -f $(includedir)/wx/generic/$$f ; \
|
||||
$(INSTALL_DATA) $$f $(includedir)/wx/generic/$$f ; \
|
||||
done
|
||||
@echo " Copying headers from /include/wx/protocol"
|
||||
@cd $(WXBASEDIR)/include/wx/protocol ; \
|
||||
for f in *.h ; do \
|
||||
rm -f $(includedir)/wx/protocol/$$f ; \
|
||||
$(INSTALL_DATA) $$f $(includedir)/wx/protocol/$$f ; \
|
||||
done
|
||||
@echo " Copying wx-config"
|
||||
@cd $(WXBASEDIR) ; \
|
||||
rm -f $(bindir)/wx-config ; \
|
||||
|
@@ -1127,7 +1127,7 @@ wxItemResource *wxResourceInterpretControl(wxResourceTable& table, PrologExpr *e
|
||||
}
|
||||
}
|
||||
#endif
|
||||
#if 0
|
||||
#if 1
|
||||
else if (controlType == "wxRadioBox")
|
||||
{
|
||||
PrologExpr *valueList = (PrologExpr *) NULL;
|
||||
|
@@ -58,6 +58,11 @@ LIB_CPP_SRC=\
|
||||
common/socket.cpp \
|
||||
common/sckaddr.cpp \
|
||||
common/sckipc.cpp \
|
||||
common/protocol.cpp \
|
||||
common/ftp.cpp \
|
||||
common/http.cpp \
|
||||
common/url.cpp \
|
||||
common/tokenzr.cpp \
|
||||
\
|
||||
gtk/accel.cpp \
|
||||
gtk/app.cpp \
|
||||
|
@@ -426,4 +426,19 @@ void wxListBox::SetFont( const wxFont &font )
|
||||
}
|
||||
}
|
||||
|
||||
bool wxListBox::IsOwnGtkWindow( GdkWindow *window )
|
||||
{
|
||||
if (wxWindow::IsOwnGtkWindow( window )) return TRUE;
|
||||
|
||||
GList *child = m_list->children;
|
||||
while (child)
|
||||
{
|
||||
GtkBin *bin = (GtkBin*) child->data;
|
||||
if (bin->child->window == window) return TRUE;
|
||||
child = child->next;
|
||||
}
|
||||
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
|
||||
|
@@ -426,4 +426,19 @@ void wxListBox::SetFont( const wxFont &font )
|
||||
}
|
||||
}
|
||||
|
||||
bool wxListBox::IsOwnGtkWindow( GdkWindow *window )
|
||||
{
|
||||
if (wxWindow::IsOwnGtkWindow( window )) return TRUE;
|
||||
|
||||
GList *child = m_list->children;
|
||||
while (child)
|
||||
{
|
||||
GtkBin *bin = (GtkBin*) child->data;
|
||||
if (bin->child->window == window) return TRUE;
|
||||
child = child->next;
|
||||
}
|
||||
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user