Don't crash if no scrollbar

[wxWidgets.git] / build / bakefiles / common.bkl

diff --git a/build/bakefiles/common.bkl b/build/bakefiles/common.bkl
index 89080fa27e19dd81424ee685bcf2441a6062244a..1618f74ee9773b74046fc2e7180dcdb9acd0af59 100644 (file)
--- a/build/bakefiles/common.bkl
+++ b/build/bakefiles/common.bkl
@@ -145,6 +145,9 @@
     <set var="WXLIB_AUI">
         <if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('aui')))</if>
     </set>
     <set var="WXLIB_AUI">
         <if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('aui')))</if>
     </set>

+    <set var="WXLIB_PROPGRID">
+        <if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('propgrid')))</if>
+    </set>

     <set var="WXLIB_RICHTEXT">
         <if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('richtext')))</if>
     </set>
     <set var="WXLIB_RICHTEXT">
         <if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('richtext')))</if>
     </set>


@@ -354,20 +357,6 @@ InputPath=..\..\include\wx\%s
 $(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h
         </if>
     </set>
 $(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h
         </if>
     </set>

-    <!-- this should be removed after new bakefile release -->
-    <if cond="FORMAT in ['msvs2005prj','msvs2003prj']">
-        <if cond="BAKEFILE_VERSION!='0.2.3'">
-            <warning>FIXME: THIS OBSOLETE CODE ISN'T NEEDED ANYMORE</warning>
-        </if>
-        <set var="msvc_copy_setup_h_script">
-Creating $(SETUPHDIR)\wx\setup.h
-InputPath=..\..\include\wx\%s
-
-"$(SETUPHDIR)\wx\setup.h" : "$(DOLLAR)(INTDIR)" "$(DOLLAR)(OUTDIR)"
-$(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h
-        </set>
-    </if>
-    <!-- end of what should be removed after new bakefile release -->

 
     <define-tag name="msvc-headers-setup-h" rules="dll,lib">
         <if cond="IS_MSVC_PRJ">
 
     <define-tag name="msvc-headers-setup-h" rules="dll,lib">
         <if cond="IS_MSVC_PRJ">


@@ -426,19 +415,6 @@ InputPath=..\..\include\wx\msw\genrcdefs.h
 "$(SETUPHDIR)\wx\msw\rcdefs.h" : "$(DOLLAR)(SOURCE)" "$(SETUPHDIR)\wx\msw"
 $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\rcdefs.h"
             </set>
 "$(SETUPHDIR)\wx\msw\rcdefs.h" : "$(DOLLAR)(SOURCE)" "$(SETUPHDIR)\wx\msw"
 $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\rcdefs.h"
             </set>

-            <!-- this should be removed after new bakefile release -->
-            <if cond="FORMAT in ['msvs2005prj','msvs2003prj']">
-                <if cond="BAKEFILE_VERSION!='0.2.3'">
-                    <warning>FIXME: THIS OBSOLETE CODE ISN'T NEEDED ANYMORE</warning>
-                </if>
-                <set var="_custom_build_include_wx_msw_genrcdefs_h">
-Creating $(SETUPHDIR)\wx\msw\rcdefs.h
-InputPath=..\..\include\wx\msw\genrcdefs.h
-
-"$(SETUPHDIR)\wx\msw\rcdefs.h" : "$(SETUPHDIR)\wx\msw"
-$(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\rcdefs.h"
-                </set>
-            </if>

         </if>
     </define-tag>
 
         </if>
     </define-tag>
 


@@ -570,6 +546,9 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
                 <sys-lib>rpcrt4</sys-lib>
                 <sys-lib>advapi32</sys-lib>
                 <sys-lib>wsock32</sys-lib>
                 <sys-lib>rpcrt4</sys-lib>
                 <sys-lib>advapi32</sys-lib>
                 <sys-lib>wsock32</sys-lib>

+                <!-- this one is only used if wxUSE_URL_NATIVE==1 but we don't
+                     know if it is here so just add it unconditionally -->
+                <sys-lib>wininet</sys-lib>

             </if>
             <if cond="FORMAT=='borland'">
                 <sys-lib>oleacc</sys-lib>
             </if>
             <if cond="FORMAT=='borland'">
                 <sys-lib>oleacc</sys-lib>