Removed wxPopupWindow from normal (non-wxUniv) build

  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

diff --git a/distrib/msw/tmake/filelist.txt b/distrib/msw/tmake/filelist.txt
index f7ee3abba250a29ec660d3f6f01aad256ed0acb3..bb3633ce72c6fe3e34a860af4d6c2075832bb0b5 100644 (file)
--- a/distrib/msw/tmake/filelist.txt
+++ b/distrib/msw/tmake/filelist.txt
@@ -181,7 +181,7 @@ object.cpp  Common  Base
 objstrm.cpp    Common  Base
 odbc.cpp       Common  NotGTK,NotX,NotOS2
 paper.cpp      Common
 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
 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
 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
 radiobox.cpp   GTK
 radiobut.cpp   GTK
 region.cpp     GTK     LowLevel

diff --git a/src/gtk/files.lst b/src/gtk/files.lst
index f57e549fe17f376c76c97e8718af854f61fabc57..537b5badb183e7036456d10317d7545aa95f2b48 100644 (file)
--- a/src/gtk/files.lst
+++ b/src/gtk/files.lst
@@ -122,7 +122,6 @@ ALL_SOURCES = \
                common/object.cpp \
                common/objstrm.cpp \
                common/paper.cpp \
                common/object.cpp \
                common/objstrm.cpp \
                common/paper.cpp \

-               common/popupcmn.cpp \

                common/prntbase.cpp \
                common/process.cpp \
                common/protocol.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/minifram.cpp \
                gtk/notebook.cpp \
                gtk/pen.cpp \

-               gtk/popupwin.cpp \

                gtk/radiobox.cpp \
                gtk/radiobut.cpp \
                gtk/region.cpp \
                gtk/radiobox.cpp \
                gtk/radiobut.cpp \
                gtk/region.cpp \


@@ -667,7 +665,6 @@ COMMONOBJS = \
                object.o \
                objstrm.o \
                paper.o \
                object.o \
                objstrm.o \
                paper.o \

-               popupcmn.o \

                prntbase.o \
                process.o \
                protocol.o \
                prntbase.o \
                process.o \
                protocol.o \


@@ -783,7 +780,6 @@ COMMONDEPS = \
                object.d \
                objstrm.d \
                paper.d \
                object.d \
                objstrm.d \
                paper.d \

-               popupcmn.d \

                prntbase.d \
                process.d \
                protocol.d \
                prntbase.d \
                process.d \
                protocol.d \


@@ -1095,6 +1091,7 @@ GUI_LOWLEVEL_DEPS = \
                icon.d \
                main.d \
                pen.d \
                icon.d \
                main.d \
                pen.d \

+               popupwin.d \

                region.d \
                settings.d \
                timer.d \
                region.d \
                settings.d \
                timer.d \

diff --git a/src/gtk1/files.lst b/src/gtk1/files.lst
index f57e549fe17f376c76c97e8718af854f61fabc57..537b5badb183e7036456d10317d7545aa95f2b48 100644 (file)
--- a/src/gtk1/files.lst
+++ b/src/gtk1/files.lst
@@ -122,7 +122,6 @@ ALL_SOURCES = \
                common/object.cpp \
                common/objstrm.cpp \
                common/paper.cpp \
                common/object.cpp \
                common/objstrm.cpp \
                common/paper.cpp \

-               common/popupcmn.cpp \

                common/prntbase.cpp \
                common/process.cpp \
                common/protocol.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/minifram.cpp \
                gtk/notebook.cpp \
                gtk/pen.cpp \

-               gtk/popupwin.cpp \

                gtk/radiobox.cpp \
                gtk/radiobut.cpp \
                gtk/region.cpp \
                gtk/radiobox.cpp \
                gtk/radiobut.cpp \
                gtk/region.cpp \


@@ -667,7 +665,6 @@ COMMONOBJS = \
                object.o \
                objstrm.o \
                paper.o \
                object.o \
                objstrm.o \
                paper.o \

-               popupcmn.o \

                prntbase.o \
                process.o \
                protocol.o \
                prntbase.o \
                process.o \
                protocol.o \


@@ -783,7 +780,6 @@ COMMONDEPS = \
                object.d \
                objstrm.d \
                paper.d \
                object.d \
                objstrm.d \
                paper.d \

-               popupcmn.d \

                prntbase.d \
                process.d \
                protocol.d \
                prntbase.d \
                process.d \
                protocol.d \


@@ -1095,6 +1091,7 @@ GUI_LOWLEVEL_DEPS = \
                icon.d \
                main.d \
                pen.d \
                icon.d \
                main.d \
                pen.d \

+               popupwin.d \

                region.d \
                settings.d \
                timer.d \
                region.d \
                settings.d \
                timer.d \

diff --git a/src/univ/combobox.cpp b/src/univ/combobox.cpp
index 4124552b779683500ec3dbe8f7f3a7540af4af62..92dc487e4ea459a0f86121179c47c82a19344973 100644 (file)
--- a/src/univ/combobox.cpp
+++ b/src/univ/combobox.cpp
@@ -88,7 +88,7 @@ public:
         SetBitmapSelected(bmpPressed);
         SetBitmapDisabled(bmpDisabled);
 
         SetBitmapSelected(bmpPressed);
         SetBitmapDisabled(bmpDisabled);
 

-        SetSize(bmpNormal.GetWidth(), bmpNormal.GetHeight());
+//        SetSize(bmpNormal.GetWidth(), bmpNormal.GetHeight());

     }
 
 protected:
     }
 
 protected:

diff --git a/src/univ/themes/win32.cpp b/src/univ/themes/win32.cpp
index 596bc217a36a2e2d9cdf2420b28a08e812d7fd56..997c95c089c84739cc7c78e0444c8afe579d0ff1 100644 (file)
--- a/src/univ/themes/win32.cpp
+++ b/src/univ/themes/win32.cpp
@@ -88,7 +88,6 @@ enum IndicatorStatus
     IndicatorStatus_Max
 };
 
     IndicatorStatus_Max
 };
 

-// ----------------------------------------------------------------------------

 // wxWin32Renderer: draw the GUI elements in Win32 style
 // ----------------------------------------------------------------------------
 
 // wxWin32Renderer: draw the GUI elements in Win32 style
 // ----------------------------------------------------------------------------
 


@@ -2682,6 +2681,7 @@ wxMenuGeometryInfo *wxWin32Renderer::GetMenuGeometry(wxWindow *win,
 
 #else // !wxUSE_MENUS
 
 
 #else // !wxUSE_MENUS
 

+/*

 void wxWin32Renderer::DrawMenuBarItem(wxDC& WXUNUSED(dc),
                                       const wxRect& WXUNUSED(rectOrig),
                                       const wxString& WXUNUSED(label),
 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;
 }
 {
     return NULL;
 }

+*/

 
 #endif // wxUSE_MENUS/!wxUSE_MENUS
 
 
 #endif // wxUSE_MENUS/!wxUSE_MENUS