i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

We definitely don't need the FIX_FOR_4_6, whatever that was about.

Browse Source 
Also restored the original locations of the class members I broke before.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@13132 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2005-06-14 22:12:32 +00:00
parent 62bb447ee0
commit b7e162e93a
1 changed files with 6 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/os/app/Application.h
+6 -13
View File
@@ -33,7 +33,6 @@ namespace BPrivate {
} }
// BApplication class ----------------------------------------------------------
class BApplication : public BLooper { class BApplication : public BLooper {
public: public:
BApplication(const char* signature); BApplication(const char* signature);
@@ -144,9 +143,8 @@ private:
bool quit_all_windows(bool force); bool quit_all_windows(bool force);
bool window_quit_loop(bool, bool); bool window_quit_loop(bool, bool);
void do_argv(BMessage* msg); void do_argv(BMessage* msg);
#ifndef FIX_FOR_4_6
void SetAppCursor(); void SetAppCursor();
#endif
uint32 InitialWorkspace(); uint32 InitialWorkspace();
int32 count_windows(bool incl_menus) const; int32 count_windows(bool incl_menus) const;
BWindow* window_at(uint32 index, bool incl_menus) const; BWindow* window_at(uint32 index, bool incl_menus) const;
@@ -157,28 +155,23 @@ private:
const char* fAppName; const char* fAppName;
BPrivate::PortLink* fServerLink; BPrivate::PortLink* fServerLink;
// uint32 _unused0; uint32 _unused0;
// int32 fServerFrom;
// int32 fServerTo;
#ifndef FIX_FOR_4_6
void* fCursorData; void* fCursorData;
#else
void* _unused1;
#endif
_server_heap_* fServerHeap; _server_heap_* fServerHeap;
bigtime_t fPulseRate; bigtime_t fPulseRate;
uint32 fInitialWorkspace; uint32 fInitialWorkspace;
_drag_data_* fDraggedMessage; _drag_data_* fDraggedMessage;
BMessageRunner* fPulseRunner; BMessageRunner* fPulseRunner;
status_t fInitError; status_t fInitError;
uint32 _reserved[12]; uint32 _reserved[11];
bool fReadyToRunCalled; bool fReadyToRunCalled;
}; };
// Global Objects -------------------------------------------------------------- // Global Objects
extern _IMPEXP_BE BApplication* be_app; extern _IMPEXP_BE BApplication* be_app;
extern _IMPEXP_BE BMessenger be_app_messenger; extern _IMPEXP_BE BMessenger be_app_messenger;
#endif // _APPLICATION_H #endif // _APPLICATION_H