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

print_server: No need to build on BeOS.

Browse Source
This commit is contained in:
Axel Dörfler
2015-10-13 16:36:19 +02:00
parent 6c3e186ceb
commit 74b10f8e82
2 changed files with 0 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/servers/print/PrintServerApp.cpp
-20
View File
@@ -111,16 +111,8 @@ PrintServerApp::PrintServerApp(status_t* err)
RetrieveDefaultPrinter(); RetrieveDefaultPrinter();
// Cache icons for selected printer // Cache icons for selected printer
#ifdef HAIKU_TARGET_PLATFORM_HAIKU
BMimeType type(PSRV_PRINTER_FILETYPE); BMimeType type(PSRV_PRINTER_FILETYPE);
type.GetIcon(&fSelectedIcon, &fIconSize); type.GetIcon(&fSelectedIcon, &fIconSize);
#else
fSelectedIconMini = new BBitmap(BRect(0,0,B_MINI_ICON-1,B_MINI_ICON-1), B_CMAP8);
fSelectedIconLarge = new BBitmap(BRect(0,0,B_LARGE_ICON-1,B_LARGE_ICON-1), B_CMAP8);
BMimeType type(PRNT_SIGNATURE_TYPE);
type.GetIcon(fSelectedIconMini, B_MINI_ICON);
type.GetIcon(fSelectedIconLarge, B_LARGE_ICON);
#endif
PostMessage(PSRV_PRINT_SPOOLED_JOB); PostMessage(PSRV_PRINT_SPOOLED_JOB);
// Start handling of spooled files // Start handling of spooled files
@@ -163,15 +155,8 @@ PrintServerApp::QuitRequested()
fHasReferences = 0; fHasReferences = 0;
} }
#ifdef HAIKU_TARGET_PLATFORM_HAIKU
delete [] fSelectedIcon; delete [] fSelectedIcon;
fSelectedIcon = NULL; fSelectedIcon = NULL;
#else
delete fSelectedIconMini;
fSelectedIconMini = NULL;
delete fSelectedIconLarge;
fSelectedIconLarge = NULL;
#endif
return true; return true;
} }
@@ -485,12 +470,7 @@ PrintServerApp::SelectPrinter(const char* printerName)
if (status == B_OK) { if (status == B_OK) {
// and add the custom icon // and add the custom icon
BNodeInfo info(&node); BNodeInfo info(&node);
#ifdef HAIKU_TARGET_PLATFORM_HAIKU
info.SetIcon(fSelectedIcon, fIconSize); info.SetIcon(fSelectedIcon, fIconSize);
#else
info.SetIcon(fSelectedIconMini, B_MINI_ICON);
info.SetIcon(fSelectedIconLarge, B_LARGE_ICON);
#endif
} }
fDefaultPrinter = Printer::Find(printerName); fDefaultPrinter = Printer::Find(printerName);
src/servers/print/PrintServerApp.h
-5
View File
@@ -92,13 +92,8 @@ private:
private: private:
ResourceManager fResourceManager; ResourceManager fResourceManager;
Printer* fDefaultPrinter; Printer* fDefaultPrinter;
#ifdef HAIKU_TARGET_PLATFORM_HAIKU
size_t fIconSize; size_t fIconSize;
uint8* fSelectedIcon; uint8* fSelectedIcon;
#else
BBitmap* fSelectedIconMini;
BBitmap* fSelectedIconLarge;
#endif
int32 fReferences; int32 fReferences;
sem_id fHasReferences; sem_id fHasReferences;
Settings* fSettings; Settings* fSettings;