Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added test for wxUSE_STATLINE in statline.cpp

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2975 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
1999-07-10 13:31:14 +00:00
parent d78b3d6414
commit f3c0f9e75f
5 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/wx/gdicmn.h
View File

@@ -264,11 +264,17 @@ public:
wxPoint GetPosition() const { return wxPoint(x, y); } wxPoint GetPosition() const { return wxPoint(x, y); }
wxSize GetSize() const { return wxSize(width, height); } wxSize GetSize() const { return wxSize(width, height); }
// MFC-like functions
long GetLeft() const { return x; } long GetLeft() const { return x; }
long GetTop() const { return y; } long GetTop() const { return y; }
long GetBottom() const { return y + height; } long GetBottom() const { return y + height - 1; }
long GetRight() const { return x + width; } long GetRight() const { return x + width - 1; }
void SetLeft(long left) { x = left; }
void SetRight(long right) { width = right - x + 1; }
void SetTop(long top) { y = top; }
void SetBottom(long bottom) { height = bottom - y + 1; }
bool operator==(const wxRect& rect) const; bool operator==(const wxRect& rect) const;
bool operator!=(const wxRect& rect) const { return !(*this == rect); } bool operator!=(const wxRect& rect) const { return !(*this == rect); }

2
include/wx/msw/setup0.h
View File

@@ -118,6 +118,8 @@
#define wxUSE_DOC_VIEW_ARCHITECTURE 1 #define wxUSE_DOC_VIEW_ARCHITECTURE 1
// Set to 0 to disable document/view architecture // Set to 0 to disable document/view architecture
#define wxUSE_MDI_ARCHITECTURE 1
// Set to 0 to disable MDI document/view architecture
#define wxUSE_PRINTING_ARCHITECTURE 1 #define wxUSE_PRINTING_ARCHITECTURE 1
// Set to 0 to disable print/preview architecture code // Set to 0 to disable print/preview architecture code
#define wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW 1 #define wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW 1

4
samples/makefile.vc
View File

@@ -66,6 +66,8 @@ all:
nmake -f makefile.vc FINAL=$(FINAL) nmake -f makefile.vc FINAL=$(FINAL)
cd $(WXDIR)\samples\sashtest cd $(WXDIR)\samples\sashtest
nmake -f makefile.vc FINAL=$(FINAL) nmake -f makefile.vc FINAL=$(FINAL)
cd $(WXDIR)\samples\config
nmake -f makefile.vc FINAL=$(FINAL)
!if "$(FINAL)" == "0" !if "$(FINAL)" == "0"
cd $(WXDIR)\samples\memcheck cd $(WXDIR)\samples\memcheck
!endif !endif
@@ -149,6 +151,8 @@ clean:
nmake -f makefile.vc clean nmake -f makefile.vc clean
cd $(WXDIR)\samples\sashtest cd $(WXDIR)\samples\sashtest
nmake -f makefile.vc clean nmake -f makefile.vc clean
cd $(WXDIR)\samples\config
nmake -f makefile.vc clean
cd $(WXDIR)\samples\memcheck cd $(WXDIR)\samples\memcheck
nmake -f makefile.vc clean nmake -f makefile.vc clean
cd $(WXDIR)\samples\minifram cd $(WXDIR)\samples\minifram

2
src/msw/makefile.g95
View File

@@ -68,7 +68,7 @@ GENERICOBJS= \
$(GENDIR)/splitter.$(OBJSUFF) \ $(GENDIR)/splitter.$(OBJSUFF) \
$(GENDIR)/statusbr.$(OBJSUFF) \ $(GENDIR)/statusbr.$(OBJSUFF) \
$(GENDIR)/tabg.$(OBJSUFF) \ $(GENDIR)/tabg.$(OBJSUFF) \
$(GENDIR)/textdlgg.$(OBJSUFF) $(GENDIR)/textdlgg.$(OBJSUFF) \
$(GENDIR)/tipdlg.$(OBJSUFF) $(GENDIR)/tipdlg.$(OBJSUFF)
# $(GENDIR)/colrdlgg.$(OBJSUFF) \ # $(GENDIR)/colrdlgg.$(OBJSUFF) \

3
src/msw/statline.cpp
View File

@@ -29,6 +29,8 @@
#include "wx/statline.h" #include "wx/statline.h"
#if wxUSE_STATLINE
#include "wx/msw/private.h" #include "wx/msw/private.h"
// ============================================================================ // ============================================================================
@@ -83,4 +85,5 @@ bool wxStaticLine::Create( wxWindow *parent,
return TRUE; return TRUE;
} }
#endif