← Back to branch summary

~ubuntu-branches/ubuntu/raring/codeblocks/raring-proposed

« back to all changes in this revision

Viewing changes to src/plugins/contrib/wxSmith/wxwidgets/wxscontainer.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Cosme Domínguez Díaz
  • Date: 2010-08-09 04:38:38 UTC
  • mfrom: (1.1.1 upstream)
  • mto: This revision was merged to the branch mainline in revision 4.
  • Revision ID: james.westby@ubuntu.com-20100809043838-a59ygguym4eg0jgw
Tags: 10.05-0ubuntu1
https://launchpad.net/bugs/322350
* New upstream release. Closes (LP: #322350)
 - Switch to dpkg-source 3.0 (quilt) format
 - Remove unneeded README.source
 - Add debian/get-source-orig script that removes all
   Windows prebuilt binaries
* Bump Standards-Version to 3.9.1
 - Stop shipping *.la files
* debian/control
 - Add cdbs package as Build-Depend
 - Add libbz2-dev and zlib1g-dev packages as
   Build-Depends (needed by libhelp_plugin.so)
 - Remove dpatch package of Build-Depends
 - Add codeblocks-contrib-debug package
 - Split architecture-independent files of codeblocks
   package in codeblocks-common package
* debian/rules
 - Switch to CDBS rules system
 - Add parallel build support
 - Add a call to debian/get-source-orig script
 - Use lzma compression (saves 23,5 MB of free space)
* debian/patches
 - Refresh 01_codeblocks_plugin_path
 - Add 02_no_Makefiles_in_debian_dir to remove any link
   in codeblocks build system to deleted Makefiles of debian directory
 - Drop 02_ftbfs_gcc44 and 03_ftbfs_glib221 (merged in upstream)
* debian/watch
 - Update to use the new host (berlios.de)

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/plugins/contrib/wxSmith/wxwidgets/wxscontainer.cpp
15
15
* You should have received a copy of the GNU General Public License
16
16
* along with wxSmith. If not, see <http://www.gnu.org/licenses/>.
17
17
*
18
 
* $Revision: 4850 $
19
 
* $Id: wxscontainer.cpp 4850 2008-01-29 21:45:49Z byo $
20
 
* $HeadURL: svn://svn.berlios.de/codeblocks/tags/8.02/src/plugins/contrib/wxSmith/wxwidgets/wxscontainer.cpp $
 
18
* $Revision: 5796 $
 
19
* $Id: wxscontainer.cpp 5796 2009-09-16 12:09:22Z mortenmacfly $
 
20
* $HeadURL: svn+ssh://jenslody@svn.berlios.de/svnroot/repos/codeblocks/trunk/src/plugins/contrib/wxSmith/wxwidgets/wxscontainer.cpp $
21
21
*/
22
22
 
23
23
#include "wxscontainer.h"
212
212
                    wxString ChildAccessPrefix = Child->GetAccessPrefix(GetLanguage());
213
213
                    if ( GetBaseProps()->m_Size.IsDefault )
214
214
                    {
 
215
                        #if wxCHECK_VERSION(2, 9, 0)
 
216
                        Codef(_T("%sFit(%O);\n"),ChildAccessPrefix.wx_str());
 
217
                        #else
215
218
                        Codef(_T("%sFit(%O);\n"),ChildAccessPrefix.c_str());
 
219
                        #endif
216
220
                    }
217
221
 
 
222
                    #if wxCHECK_VERSION(2, 9, 0)
 
223
                    Codef(_T("%sSetSizeHints(%O);\n"),ChildAccessPrefix.wx_str());
 
224
                    #else
218
225
                    Codef(_T("%sSetSizeHints(%O);\n"),ChildAccessPrefix.c_str());
 
226
                    #endif
219
227
                }
220
228
            }
221
229