AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Removed wxPopupWindow from normal (non-wxUniv) build

Browse Source 
as it expects a non-native combobox (which is a bug,
  of course).
  Minor compile thing for wxUniv branch.
  The library currently does not build due to problems
  in wxListCtrl.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10907 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling 2001-07-09 12:20:04 +00:00
parent 45f22d48cd
commit 1629fb3b72
5 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
distrib/msw/tmake/filelist.txt
View File

@ -181,7 +181,7 @@ object.cpp Common Base
objstrm.cpp Common Base
odbc.cpp Common NotGTK,NotX,NotOS2
paper.cpp Common
popupcmn.cpp Common
popupcmn.cpp Common NotGTK
prntbase.cpp Common
process.cpp Common Win32Only,Base
protocol.cpp Common Socket,Base
@ -404,7 +404,7 @@ menu.cpp GTK
minifram.cpp GTK
notebook.cpp GTK
pen.cpp GTK LowLevel
popupwin.cpp GTK LowLevel
popupwin.cpp LowLevel
radiobox.cpp GTK
radiobut.cpp GTK
region.cpp GTK LowLevel

5
src/gtk/files.lst
View File

@ -122,7 +122,6 @@ ALL_SOURCES = \
common/object.cpp \
common/objstrm.cpp \
common/paper.cpp \
common/popupcmn.cpp \
common/prntbase.cpp \
common/process.cpp \
common/protocol.cpp \
@ -196,7 +195,6 @@ ALL_SOURCES = \
gtk/minifram.cpp \
gtk/notebook.cpp \
gtk/pen.cpp \
gtk/popupwin.cpp \
gtk/radiobox.cpp \
gtk/radiobut.cpp \
gtk/region.cpp \
@ -667,7 +665,6 @@ COMMONOBJS = \
object.o \
objstrm.o \
paper.o \
popupcmn.o \
prntbase.o \
process.o \
protocol.o \
@ -783,7 +780,6 @@ COMMONDEPS = \
object.d \
objstrm.d \
paper.d \
popupcmn.d \
prntbase.d \
process.d \
protocol.d \
@ -1095,6 +1091,7 @@ GUI_LOWLEVEL_DEPS = \
icon.d \
main.d \
pen.d \
popupwin.d \
region.d \
settings.d \
timer.d \

5
src/gtk1/files.lst
View File

@ -122,7 +122,6 @@ ALL_SOURCES = \
common/object.cpp \
common/objstrm.cpp \
common/paper.cpp \
common/popupcmn.cpp \
common/prntbase.cpp \
common/process.cpp \
common/protocol.cpp \
@ -196,7 +195,6 @@ ALL_SOURCES = \
gtk/minifram.cpp \
gtk/notebook.cpp \
gtk/pen.cpp \
gtk/popupwin.cpp \
gtk/radiobox.cpp \
gtk/radiobut.cpp \
gtk/region.cpp \
@ -667,7 +665,6 @@ COMMONOBJS = \
object.o \
objstrm.o \
paper.o \
popupcmn.o \
prntbase.o \
process.o \
protocol.o \
@ -783,7 +780,6 @@ COMMONDEPS = \
object.d \
objstrm.d \
paper.d \
popupcmn.d \
prntbase.d \
process.d \
protocol.d \
@ -1095,6 +1091,7 @@ GUI_LOWLEVEL_DEPS = \
icon.d \
main.d \
pen.d \
popupwin.d \
region.d \
settings.d \
timer.d \

2
src/univ/combobox.cpp
View File

@ -88,7 +88,7 @@ public:
SetBitmapSelected(bmpPressed);
SetBitmapDisabled(bmpDisabled);
SetSize(bmpNormal.GetWidth(), bmpNormal.GetHeight());
// SetSize(bmpNormal.GetWidth(), bmpNormal.GetHeight());
}
protected:

3
src/univ/themes/win32.cpp
View File

@ -88,7 +88,6 @@ enum IndicatorStatus
IndicatorStatus_Max
};
// ----------------------------------------------------------------------------
// wxWin32Renderer: draw the GUI elements in Win32 style
// ----------------------------------------------------------------------------
@ -2682,6 +2681,7 @@ wxMenuGeometryInfo *wxWin32Renderer::GetMenuGeometry(wxWindow *win,
#else // !wxUSE_MENUS
/*
void wxWin32Renderer::DrawMenuBarItem(wxDC& WXUNUSED(dc),
const wxRect& WXUNUSED(rectOrig),
const wxString& WXUNUSED(label),
@ -2718,6 +2718,7 @@ wxWin32Renderer::GetMenuGeometry(wxWindow *WXUNUSED(win),
{
return NULL;
}
*/
#endif // wxUSE_MENUS/!wxUSE_MENUS